Fixed some output details