Fixed and added Doxygen comments