diff --git a/cicecore/cicedynB/general/ice_forcing.F90 b/cicecore/cicedynB/general/ice_forcing.F90
index 0f08b6e66..8110312a7 100644
--- a/cicecore/cicedynB/general/ice_forcing.F90
+++ b/cicecore/cicedynB/general/ice_forcing.F90
@@ -197,6 +197,10 @@ subroutine alloc_forcing
          stat=ierr)
       if (ierr/=0) call abort_ice('(alloc_forcing): Out of Memory')
 
+! initialize this, not set in box2001 (and some other forcings?)
+
+      cldf = c0
+
       end subroutine alloc_forcing
 
 !=======================================================================
diff --git a/cicecore/version.txt b/cicecore/version.txt
index 8d067b669..fb024cb80 100644
--- a/cicecore/version.txt
+++ b/cicecore/version.txt
@@ -1 +1 @@
-CICE 6.0.dev
+CICE 6.0.0
diff --git a/configuration/scripts/ice_in b/configuration/scripts/ice_in
index 14e4c96cb..4841f45dc 100644
--- a/configuration/scripts/ice_in
+++ b/configuration/scripts/ice_in
@@ -100,7 +100,7 @@
 
 &dynamics_nml
     kdyn            = 1
-    ndte            = 120
+    ndte            = 240
     revised_evp     = .false.
     advection       = 'remap'
     kstrength       = 1
diff --git a/configuration/scripts/machines/Macros.conrad_cray b/configuration/scripts/machines/Macros.conrad_cray
index 642454380..b626c2be2 100644
--- a/configuration/scripts/machines/Macros.conrad_cray
+++ b/configuration/scripts/machines/Macros.conrad_cray
@@ -14,6 +14,7 @@ LDFLAGS    := -h byteswapio
 
 ifeq ($(ICE_BLDDEBUG), true)
   FFLAGS     += -O0 -g -Rbcdps
+#  FFLAGS     += -O0 -g -Rbcdps -ei
 else
   FFLAGS     += -O2
 endif
diff --git a/configuration/scripts/machines/Macros.conrad_intel b/configuration/scripts/machines/Macros.conrad_intel
index 191da715a..c0b48821f 100644
--- a/configuration/scripts/machines/Macros.conrad_intel
+++ b/configuration/scripts/machines/Macros.conrad_intel
@@ -13,6 +13,7 @@ FFLAGS_NOOPT:= -O0
 
 ifeq ($(ICE_BLDDEBUG), true)
   FFLAGS     += -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created
+#  FFLAGS     += -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created -init=snan,arrays
 else
   FFLAGS     += -O2
 endif
diff --git a/doc/source/conf.py b/doc/source/conf.py
index c6dd7aa8d..3f9c0bd6f 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -62,9 +62,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'6.0.dev' 
+version = u'6.0.0' 
 # The full version, including alpha/beta/rc tags.
-version = u'6.0.dev' 
+version = u'6.0.0' 
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/doc/source/user_guide/ug_case_settings.rst b/doc/source/user_guide/ug_case_settings.rst
index 727a7c47d..fe5821e9a 100755
--- a/doc/source/user_guide/ug_case_settings.rst
+++ b/doc/source/user_guide/ug_case_settings.rst
@@ -259,7 +259,7 @@ Table of namelist options
    "", "``1``", "dynamics ON", ""
    "``revised_evp``", "true/false", "use revised EVP formulation", ""
    "``basalstress``", "true/false", "use bottom basal stress", ""
-   "``ndte``", "integer", "number of EVP subcycles", "120"
+   "``ndte``", "integer", "number of EVP subcycles", "240"
    "``advection``", "``remap``", "linear remapping advection", "‘remap’"
    "", "``upwind``", "donor cell advection", ""
    "``kstrength``", "``0``", "ice strength formulation :cite:`Hibler79`", "1"
diff --git a/icepack b/icepack
index 5d22a61ad..c88604761 160000
--- a/icepack
+++ b/icepack
@@ -1 +1 @@
-Subproject commit 5d22a61ada14c8d0ec9c50c615df80b4a036ad53
+Subproject commit c88604761c011e39792a67bec20b35272313bb9a