Updated Character Armor Attribute, and small tweaks