- search cleanup: simplified stopping search
- using less grain size of 2
- fixes