upgrade to 4.6
fix some little oddities in shots