some minor changes to map and bugfix