Added teleport, various fixes