All @amorag suggestions addressed

And a few corrections on the side