Fixed bugs from final tests on guillimin.  Ready for push to master.
Fixed bugs after final development testing on Guillimin.
Fixes bugs from final development testing on Guillimin.