big changes

Updates to a number of classes.