Fixed stepper. Some performance fixes too.