Splitting keyword count between decks, and a couple bugfixes to keyword counting.