bugfixes and map changes