Flow, typos and minor tweaks.