tweaked defs of top level classes - edits arising from work on draft paper.