fix some more of this and that