Some improvements to blacksmith