fixing more bugs in CommandTeleport