Minor bug fixes, started on player.py