Updated map wrap mixin a bit, still has flashing issues.