diff --git a/extern/stim b/extern/stim
index 2c317831..eb7d7af9 160000
--- a/extern/stim
+++ b/extern/stim
@@ -1 +1 @@
-Subproject commit 2c3178311a07a4d4132ebbde59c4f6e669ff0f80
+Subproject commit eb7d7af97dc77c4b124f2ca8de5e69bd8b4c835e
diff --git a/src/airsea/airsea.F90 b/src/airsea/airsea.F90
index 406f0d4c..748d87aa 100644
--- a/src/airsea/airsea.F90
+++ b/src/airsea/airsea.F90
@@ -264,7 +264,7 @@ subroutine init_airsea_nml(namlst, fn)
    REALTYPE                  :: const_tx,const_ty
    REALTYPE                  :: const_precip
    REALTYPE                  :: precip_factor
-   integer                  :: back_radiation_method 
+   integer                   :: back_radiation_method 
    integer                   :: heat_method
 
    namelist /airsea/ calc_fluxes, &
@@ -498,9 +498,9 @@ subroutine init_airsea_yaml()
                 minimum=0._rk,default=0._rk, extra_options=(/option(3, 'from time, location and cloud cover', 'calculate')/))
    call branch%get(ql_, 'longwave_radiation', 'longwave radiation', 'W/m^2', &
                 default=0._rk, method_file=0, method_constant=method_unsupported, &
-              extra_options=(/option(CLARK, 'Clark et al. (1974)', 'Clark'), option(HASTENRATH_LAMB, 'Hastenrath and Lamb (1978)', 'Hastenrath_Lamb'), option(BIGNAMI, 'Bignami et al. (1995)', 'Bignami'), option(BERLIAND_BERLIAND, 'Berliand and Berliand (1952)', 'Berliand_Berliand'), option(JOSEY1, 'Josey et al. (2003) - 1', 'Josey1'), option(JOSEY2, 'Josey et al. (2003) - 2', 'Josey2')/), default_method=CLARK, pchild=leaf)
+               extra_options=(/option(CLARK, 'Clark et al. (1974)', 'Clark'), option(HASTENRATH_LAMB, 'Hastenrath and Lamb (1978)', 'Hastenrath_Lamb'), option(BIGNAMI, 'Bignami et al. (1995)', 'Bignami'), option(BERLIAND_BERLIAND, 'Berliand and Berliand (1952)', 'Berliand_Berliand'), option(JOSEY1, 'Josey et al. (2003) - 1', 'Josey1'), option(JOSEY2, 'Josey et al. (2003) - 2', 'Josey2')/), default_method=CLARK, pchild=leaf)
    call leaf%get(longwave_type, 'type', 'longwave type from file', &
-                 options=(/option(1, 'net longwave radiation'), option(2, 'incoming longwave radiation')/), default=1)
+               options=(/option(1, 'net longwave radiation'), option(2, 'incoming longwave radiation')/), default=1)
 
          
    twig => branch%get_typed_child('albedo')
@@ -696,7 +696,7 @@ subroutine post_init_airsea(lat,lon)
       LEVEL3 'longwave radiation:'
       select case (ql_%method)
          case(0) ! Read from file instead of calculating
-            call register_input(ql_) 
+            call register_input(ql_)
          case(CLARK)
             LEVEL4 'using Clark formulation'
          case(HASTENRATH_LAMB)
@@ -767,7 +767,7 @@ subroutine surface_fluxes_uvic(surface_temp,sensible,latent,longwave_radiation_v
 
       call humidity(hum_method,hum%value,airp%value,tw,airt%value)
       call longwave_radiation(ql_%method,longwave_type, &
-                        dlat,tw_k,ta_k,cloud%value,ql_%value,longwave_radiation_value) 
+                        dlat,tw_k,ta_k,cloud%value,ql_%value,longwave_radiation_value)
       call airsea_fluxes(fluxes_method, &
                      tw,airt%value,u10%value,v10%value,precip%value,evap,tx_%value,ty_%value,latent,sensible)
 
@@ -1020,7 +1020,7 @@ subroutine flux_from_meteo(jul,secs)
       call humidity(hum_method,hum,airp,tw,ta)
       call longwave_radiation(ql_%method,longwave_type, &
                               dlat,tw_k,ta_k,cloud,ql_%value,ql)
-     ! end if
+
 #if 0
       call airsea_fluxes(fluxes_method,rain_impact,calc_evaporation, &
                          tw,ta,u10%value-ssu,v10%value-ssv,precip%value,evap,tx2,ty2,qe,qh)
diff --git a/src/airsea/longwave_radiation.F90 b/src/airsea/longwave_radiation.F90
index c99cb372..02e96e29 100644
--- a/src/airsea/longwave_radiation.F90
+++ b/src/airsea/longwave_radiation.F90
@@ -68,14 +68,14 @@ subroutine longwave_radiation(method,type,dlat,tw,ta,cloud,qlobs,ql)
    ccf= cloud_correction_factor(nint(abs(dlat))+1)
 
    select case(method)
-      case(FILE)
-         select case(type)
-            case(1)
-               ql=qlobs
-            case(2)
-               ql = qlobs-bolz*emiss*(tw**4)
-         end select
-      case(CLARK)
+   case(FILE)
+      select case(type)
+         case(1)
+            ql=qlobs
+         case(2)
+            ql = qlobs-bolz*emiss*(tw**4)
+      end select
+   case(CLARK)
 !        Clark et al. (1974) formula.
 !        unit of ea is Pascal, must hPa
 !        Black body defect term, clouds, water vapor correction
diff --git a/src/gotm/gotm.F90 b/src/gotm/gotm.F90
index d3542a7e..5cea4065 100644
--- a/src/gotm/gotm.F90
+++ b/src/gotm/gotm.F90
@@ -776,15 +776,9 @@ subroutine integrate_gotm()
 #ifdef _ICE_
       Qsw = I_0%value
 
-  !jpnote
       call do_ice(h(nlev),dt,T(nlev),S(nlev),ta,precip%value,Qsw, &  
                   surface_fluxes,surface_fluxes_uvic,julianday,secondsofday, &
                   I_0%value,airt%value,rho(nlev),rho_0,albedo,heat%value)
-     ! call do_ice(h(nlev),dt,T(nlev),S(nlev),ta,precip%value,Qsw, &  
-                !  surface_fluxes,surface_fluxes_uvic,julianday,secondsofday,longitude, &
-                !  latitude,I_0%value,airt%value,airp%value,hum%value, &
-                !  u10%value,v10%value,cloud%value,rho(nlev),rho_0,ql%method, &  
-                !  hum_method,fluxes_method,albedo,heat%value)
 
 #endif