Added player-specific TP case.
Removed debug, some more fixes