Further comment clean-up and some changes for the Doxygen documentation: