improved shooting code
merged
derp