Forgot to allow for the possible annotation line when calculating line
offset -- fixed. Implemented better highlighting of a problem's related
token. Adjusted problem formatting slightly.