Editing map nonsense
updated directions
Merge remote-tracking branch 'origin/master' into Thew's-branch
I hope this doesn’t screw anything up