minor design changes

3 jobs for master in 28 seconds (queued for 6 seconds)