fixed a few more things I forgot in the refactor