More changes that Simon suggested, storing these for later,
probably wont be merged back in, but useful for reference