Changed id to player_id making it more consequent.
Fixed comment for function handle.
SwapDone logic implemented.