Minor bugfixes, and sentence-demarcated files