Final wordsub fixes before 0.2!