DERP! fixes a lot of broken stuff