fix stuff that I broke earlier. Derp.