updated map and minor fixes