Applied some minor fixes - but the map will look "half" broken as I'm in the middle of testing something