leaner, cleaner findit

fixes #25
fixes #29
fixes #32
fixes #33