Completed findFile() function; some other changes