more output improvements