Update CommandsTeleportation and minor fixes
Merge origin/master