fixed todo state cycling