ongoing state, fixes #35, r=@twobraids
Merge pull request #39 from peterbe/ongoing-state-fixes-35

ongoing state, fixes #35