Changes to doxygen markup to solve a few problems that upset
doxygen, and to correct minor errors.