weapon names, other equip * some feats

Totally untested... I'm sure that nothing will break when I go to use it. :-P