search using path broken

+ various cleanups

fixes issue #9