some fixes
added doxygen comments