More updates

Updates to a bunch of classes.