Fixed everything but the map