find_funs improvements from richierocks.
Closes #2