refs #7200 Doxygen comments and minor modifications