Fix up the printing of work orders, make sure the variables are correctly set etc
Merge pull request #403 from timschofield/develop

Fix up the printing of work orders, make sure the variables are correctl...