More shooting fixes
Merge branch 'master' of https://github.com/rambowaves/Grid