Changes from review notes by timograham and loic84