fixed half of the stuff I broke -.-'