fix save steps
fix flows again
fix flows numbering