More ocean tweaks/fixes.