Major blacksmith improvements

need a good cleanup
Merge pull request #3 from Jay1/master

Major blacksmith improvements