fix some more stuff