finished initial complete jobreport work, plus some other changes