Comment and doxygen fixes