Added map saving to the simulator. Also formatting.