Map changes + Bugfixes