flow: more work and fun stuff

Change-Id: Ia80c282249cb1b9e4e1f5012b9a154909d0ec49f