Improved managing players.

But it still needs a lot of work.