Corrected steps vs BPM

Added substeps (6 per step)
Adjusted structs accordingly