Flesh out classifiers

This adds classifiers missing in certain key areas.

r?