Corrections to doxygen

As titled.
See commit messages for details.