Add info about repeatibility into help output
Rework step output in corner cases