Calculations are now correct for GPA and Course