Flesh out classifiers  r=peterbe

This adds classifiers missing in certain key areas.