fix a few more things