updated map and stuff