Add some more doxygen comments