fixed highlighting stuff