Gun Fixes and more