Save/load global map, misc fixes