more highlight /diminish fixes