Updates for cannons and sailboat classes. Check in prior to 3.5.6 update

Signed-off-by: CaptainMurphy <captain@teamduck.com>