fixing a few keyword highlighting issues