more comment cleanup
started setting up working space for std::map
fixed build