some changes, mostly about candidate generation
Merge branch 'master' of github.com:iucl/l2-writing-assistant
Merge branch 'master' of github.com:iucl/l2-writing-assistant
Merge branch 'master' of github.com:iucl/l2-writing-assistant