synch up and cleanup for map versions
3 files changed