Fix bugs with extracting generation from kanji, reject conflicting kanji, better handle dashes.