fixed more things I broke