Map fixing

Map fixes WIP