minor hacks, countin steps and substeps