fixed a bunch of derps