Added GameManager, removed flow bugs