Fix #42; Prepopulate step number, update when steps are removed