fix lots of derps