incorporating ohTidal changes, plus some tidy up