start search improvements
code cleanup, WIP