Improve time management

This required some changes to the player interface!