Set inital player state appropriately. Also set it during setup.

Fixes #34
Fixes #35