more teleport bad xml problems
Merge branch 'stage'