More work on cargo ship + eating loop fix