Fixed all errors due to the refactoring. Probably should have fixed those before I pushed. :/