Fixed more stuff that I broke.... Again.