Code cleanup and preparation for v1.9.5
Added Carpenter's Torch.