Some editorial fixes based on Sandro's feedback

This addresses #234