Evan dev

Add's improvements to the makeflow file and moves the generation forward to a stable point.