Fixed errors, added Weapon class