Some editorial fixes based on Sandro's feedback