Add more keywords.
Clean up categorization of classification types.
New sample.