Doxygen , and some changes to code