Added doxygen doc generation, misc comment