Minor improvements and updated doxygen