extra minor output improvements