make fixes proposed by @liviastacey and @chrissorchard