Bugfixes, added map cords