fixes highlight and exercise bugs