Tested some features of the map
Merged changes