changed a couple of search paths to os.join