Bug Fixes to grid events.
Merge branch 'master' of https://github.com/skyvers/wildcat.git