diff --git a/makefile_and_run.py b/makefile_and_run.py
index f539764..c3ab492 100755
--- a/makefile_and_run.py
+++ b/makefile_and_run.py
@@ -140,16 +140,21 @@ def _gpu_runtime_env():
     runtime_env = os.environ.copy()
 
     defaults = {
+        "AMSS_EVOLVE_TIMING": "1",
+        "AMSS_ESCALAR_STEP_TIMING": "0",
         "AMSS_INTERP_FAST": "1",
         "AMSS_INTERP_GPU": "1",
         "AMSS_ANALYSIS_MAP_EVERY": "1000000",
         "AMSS_CUDA_AWARE_MPI": "1",
         "AMSS_CUDA_KEEP_RESIDENT_AFTER_STEP": "1",
         "AMSS_CUDA_KEEP_ALL_LEVELS": "1",
+        "AMSS_CUDA_ESCALAR_KEEP_RESIDENT_AFTER_STEP": "1",
+        "AMSS_CUDA_ESCALAR_KEEP_ALL_LEVELS": "1",
         "AMSS_CUDA_AMR_HOST_STAGED": "1",
         "AMSS_CUDA_AMR_RESTRICT_DEVICE": "1",
         "AMSS_CUDA_AMR_RESTRICT_BATCH": "0",
         "AMSS_CUDA_DEVICE_SEGMENT_BATCH": "0",
+        "AMSS_CUDA_UNCACHED_DEVICE_BUFFERS": "1",
     }
     for key, value in defaults.items():
         runtime_env.setdefault(key, value)
@@ -275,13 +280,18 @@ def run_ABE():
         print(f"   AMSS_INTERP_FAST={mpi_env.get('AMSS_INTERP_FAST', '')}")
         print(f"   AMSS_INTERP_GPU={mpi_env.get('AMSS_INTERP_GPU', '')}")
         print(f"   AMSS_ANALYSIS_MAP_EVERY={mpi_env.get('AMSS_ANALYSIS_MAP_EVERY', '')}")
+        print(f"   AMSS_EVOLVE_TIMING={mpi_env.get('AMSS_EVOLVE_TIMING', '')}")
+        print(f"   AMSS_ESCALAR_STEP_TIMING={mpi_env.get('AMSS_ESCALAR_STEP_TIMING', '')}")
         print(f"   AMSS_CUDA_AWARE_MPI={mpi_env.get('AMSS_CUDA_AWARE_MPI', '')}")
         print(f"   AMSS_CUDA_KEEP_RESIDENT_AFTER_STEP={mpi_env.get('AMSS_CUDA_KEEP_RESIDENT_AFTER_STEP', '')}")
         print(f"   AMSS_CUDA_KEEP_ALL_LEVELS={mpi_env.get('AMSS_CUDA_KEEP_ALL_LEVELS', '')}")
+        print(f"   AMSS_CUDA_ESCALAR_KEEP_RESIDENT_AFTER_STEP={mpi_env.get('AMSS_CUDA_ESCALAR_KEEP_RESIDENT_AFTER_STEP', '')}")
+        print(f"   AMSS_CUDA_ESCALAR_KEEP_ALL_LEVELS={mpi_env.get('AMSS_CUDA_ESCALAR_KEEP_ALL_LEVELS', '')}")
         print(f"   AMSS_CUDA_AMR_HOST_STAGED={mpi_env.get('AMSS_CUDA_AMR_HOST_STAGED', '')}")
         print(f"   AMSS_CUDA_AMR_RESTRICT_DEVICE={mpi_env.get('AMSS_CUDA_AMR_RESTRICT_DEVICE', '')}")
         print(f"   AMSS_CUDA_AMR_RESTRICT_BATCH={mpi_env.get('AMSS_CUDA_AMR_RESTRICT_BATCH', '')}")
         print(f"   AMSS_CUDA_DEVICE_SEGMENT_BATCH={mpi_env.get('AMSS_CUDA_DEVICE_SEGMENT_BATCH', '')}")
+        print(f"   AMSS_CUDA_UNCACHED_DEVICE_BUFFERS={mpi_env.get('AMSS_CUDA_UNCACHED_DEVICE_BUFFERS', '')}")
         if "CUDA_MPS_PIPE_DIRECTORY" in mpi_env:
             print(f"   CUDA_MPS_PIPE_DIRECTORY={mpi_env['CUDA_MPS_PIPE_DIRECTORY']}")