some new comments and organization for some classes