map fixes updated