Updating with new map addition and minor other changes