More work on tree gen, including BlockStuffLog