Merge of offshore work

Merge of offshore work, tweak case details, tweaks & repairs