More formatting fixes and doxygen stuff