find-file-in-project added. lisp code cleanup.
merged changes from mainstream