Fixed some muzzle stuff.
Merge branch 'alex2' into odkken2