"fixed" saving and loading

It seems to work much more often for me (possibly all the time, but
haven't tested enough). I will now try to tackle the map bit