Added map loading and saving, ironed out a few problems