updated some stuff, totally broke the map, need to fix next commit