Updates to "small, sharp tools"