Major blacksmith improvements

need a good cleanup