Weapon list and form fixes