some more changes to player handling