Fixing things I broke. Sry!