Cleanup some code, FIX teleporting at the start of a match.