Added incremental updates, FTS, and comments