fixed highlighting issues