misc changes in work generation