Teleport grouping and ordering. Teleport fixes.