some more changes, still not yet finished with ScanWords reorganization
Merge branch 'master' of https://github.com/khwillia/repss