A few logical changes to the highlighting