bugfixes in maps