Merge pull request #469 from peternewman/e1.37-2

Fix some Doxygen bugs
Hopefully fix the final Doxygen warnings