Fixed some stuff on map