minor changes to some classes.