Use better wordnet definitions, improve parsing