more sillyness and cleaning up the output