lots of improvements. fewer nonstandard classes.