Weapon list improvments and bug fixes
Merge branch 'release/pianoman-h'