Fix comment for analytics
Change destination determination

Ship won't come back by "mistake".