Some doxygen cleanup and fixes