progress on map and bugfixes