Better avoiding of false positives for  years, adding in course number and GPA checking, issue #5