Changes after feedback given by readers

Considering contributions from Efraim Gentil, Jesper Pedersen and Scott Marlow.