output formating fixes and improvements