Improve recursive search.
Fix trivial x 100 mistakes.