teleporters working a bit better