Fixed some map bugs.
Removed unnecessary functions from map.
More fixes.