various map fixes.