Add question count per state & current state

For #158