better save/load m map, incl. yaml-cpp driven goodiness. Some other small tweaks