Omitted debug via #define, finished doxygen stuff