KWIC bug fixed, misc cleaning