large commit of tool updates, mostly simple