Formatting, doxygen changes, and one code typo.