Added a couple of classes; cleaned up errors