fixed a few errors regarding the map. 100% functionality is not there just yet
fixed merge issues