Fixed the map class

By a lot