Some clean up - player
Fixed conflicts