some output improvements