Minor tweaks from our meeting