Number 1-I've converted many weapons from some Monstrous Manuals.
Number 2-I've added a book (Weapons - An International Encyclopedia from 5000 
BC to 2000 AD) it has a lot of weapon variations.
Number 3-I've sorted it a few different ways.
By Book-Sorted by original source martial. 
By Setting-Sorted by Kara Tur, Base, Tool, ect.
By Group-Sorted by Axe, Sword, Bow, ect.
There is also a full list version that is only sorted by 
Simple/Martial/Exotic & Melee/Ranged/Amoo
I've also separated the armor into it's own file.