One line per sentence

… which is much better if we ever have to merge.
Also fixed a few minor issues.