fixing major errors