a few more edits to the class definitions