Fixing major errors throughout app