Thread 'fixed', gamestates added