Worldmap & Bugfixes