fixed the stuff I broke