fixed a lot of derps