Ship Odyssey: Latest Bug Fixes

This is the latest update for today's work (Aug 1st). Please compare, test, and [if it looks good] merge.