minor class definition changes...