Doxygen wrapcomments fixes

It turns out running the wrapcomments.py script without checking the output earlier this week caused a gigantic mess in the comments. Here I am fixing the script and some of the doxygen files manually. The output should be relatively clean (no doxygen warnings).