- Improved doxygen, added debug code