FindInRange implemented
Minor corrections, regrouping