fixing highlighting stuff