Added highlight feature as well as smoother regex capabilities