map fixes
all the changes