Tidied up equality for maps
Finished saving. Now for loading!