tools output improvements