Bugfixes and work on new map