Fixed Most Map Stuff