a few tweaks

StepIndex should actually be -1 (starts at zero, d'oh)