Improvements in plot and results output