A whole mess of features (and fix some lemma issues)