Fixes everywhere and more minor work on teleportation.