fix some nonsense
make fixes proposed by @liviastacey and @chrissorchard