Revised definitions of some classes. (halfway)