Changes to SurveyConductor class to fix a few minor issues - JDR