Map is now displayed almost correctly... lol