Weapon list improvments and bug fixes