Flowchart, and small refinements

Small adjustments