Minor improvements and doxygen