made some fixes to things I broke