Added support for proper incremental search
Bunch of code cleanup