StepCounter finished

some last bugfixes and stuff