improving highlighting a bit