fixed and tweaked saving and map switching