small changes to current player handling