Added some more doxygen comments