Fixing issue with relative search path, and made some minor changes