fix some issues with job monitoring, etc.
Merge branch '__'