Map Changes redone.

After a little bit of buginess in the merge, map's all good now.