Cleaned up some of the comments ... removed vestiges of last year's doxygen experiment