Map fixes
Changed the name of the class map into GameMap to avoid problems with
the data structure map