fixed stuff I broke