Map saving and loading + minor things - v5