appropriate. Fix several inconsistencies between device class and attributes. Mostly from Chris Demetriou.