Got the changes ready to save configurations.
Some small changes in preparation for saving configurations and jobs.
Merge pull request #413 from Jedwondle/master

Changes ready for saving configurations.