Added more Doxygen comments