Grammar fixes, tweaks for flow