added support for GPA, fixed formatting