Map extractor messages have been cleaned up.

Also a few Doxygen style code comments have been added.