some more work on scheduling and general naming