Added incsearch, cleanup