Little fix for Weapon Object commit

Plus some rifle bug analysis code