May have fixed doxygen problems.