bugs in class definition fixed this morning