Cannon tweaks

Syncing cannon fire and bobber functionality to more closely match.