Working branch

This fixes a bunch of the Doxygen warnings, though there were a few which I wasn't sure how to fix.