Fixes to stepcounter WIP2