Ferry Working

And assorted changes