More output improvements