Minor tweaks
Cannon changes