Yeah, some HUD indication of the progress and goals would really improve the experience. Right now I have a dozen of invisible states that drive the game logic, and this is far from ideal.
Thanks for going through all that!