Added stuff to the combat system and attributes