fixed stuff regrading std::map