Added better parsing, no longer stripping course name punctuation