followup to #149 - grammar and tweaks