Added Tools and Armor
Some changes