Amended main class to be up to date with currently used search class.
README fixes.