Fixed a few bugs in regards to the change I made to maps origin. I knew I wouldn't get it on the first try ;)