make job process flow easier to follow and shake out a few bugs