Fixing major major errors