Various changes to output reporting
Further refinement of outputs