Adding some doxygen comments, still need to document all