general updates to many of the classes. added some toString() methods to
help with testing