Fixed bugs and added GPA