Add plugin IncSearch and clean up a little