mostly bug fixes and some new variables in the *ocean* module