fixed find method and documented code upto current point
fixed merge conflicts in JS