Update Doxygen comments. Use flags for criteria, and store in a single map rather than separate variables.