Slight changes to output to be more informative