Fixed across world teleport blocking, general code cleanup