updated a bunch of classes
updated classes