pull in Timcraft improvements, and improve test for count too