Updated Doxygen to reflect newest code modifications