Final map fixes, should be good to go now.