Removed OutputNode class.  Made some small changes to the class definitions.