doxygen edits
Merge pull request #689 from dcoeurjo/doxygenEdits

doxygen edits
merging from master
cleanup