fixed some of the stuff I broke