bugfixes & doxygen-annotation