Some improvements to Blacksmith