fix some more