Added doxygen comments.
Removed unused USE_UM6 variable (previously defined for debugging purposes).
Cleanup of header and source files.