Map reworked v2
Fix
Another fix

fixing buggs etc