fixing validate issues
fixing typo
updating combatweapon
updating combatform/weapon
updating DRG
updating sam's combatform