diff --git a/crates/flock-core/configs/ligerito/m22_fast.toml b/crates/flock-core/configs/ligerito/m22_fast.toml
index 53e86391..671b38c7 100644
--- a/crates/flock-core/configs/ligerito/m22_fast.toml
+++ b/crates/flock-core/configs/ligerito/m22_fast.toml
@@ -14,61 +14,61 @@ log_num_interleaved = 6
 k_recursive = 6
 regime = "johnson_ood"
 eta = 0.02
-queries = 279
-grinding_bits = 0
+queries = 244
+grinding_bits = 16
 fold_grinding_bits = 0
 claim_batch_grinding_bits = 6
 consistency_batch_grinding_bits = 9
 ood_samples = 1
 target_security_bits = 100
 expected_eps_pg_bits = 219.0
-expected_eps_query_bits = 128.3
+expected_eps_query_bits = 112.2
 expected_eps_ood_bits = 238.3
 expected_eps_claim_batch_bits = 122.9
 expected_eps_sumcheck_bits = 249.9
-expected_eps_consistency_batch_bits = 119.7
+expected_eps_consistency_batch_bits = 119.9
 
 [[levels]]
-log_inv_rate = 2
+log_inv_rate = 3
 log_msg_cols = 6
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 136
-grinding_bits = 0
+queries = 79
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
+claim_batch_grinding_bits = 7
 consistency_batch_grinding_bits = 9
 ood_samples = 2
 target_security_bits = 100
 expected_eps_pg_bits = 223.8
-expected_eps_query_bits = 128.3
-expected_eps_ood_bits = 239.1
-expected_eps_claim_batch_bits = 122.4
-expected_eps_sumcheck_bits = 249.4
-expected_eps_consistency_batch_bits = 119.4
+expected_eps_query_bits = 112.2
+expected_eps_ood_bits = 238.1
+expected_eps_claim_batch_bits = 121.9
+expected_eps_sumcheck_bits = 248.9
+expected_eps_consistency_batch_bits = 119.0
 
 [[levels]]
-log_inv_rate = 4
+log_inv_rate = 5
 log_msg_cols = 3
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 68
-grinding_bits = 0
+queries = 48
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
+claim_batch_grinding_bits = 8
 consistency_batch_grinding_bits = 10
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 226.1
-expected_eps_query_bits = 128.4
-expected_eps_ood_bits = 238.1
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.5
+expected_eps_pg_bits = 225.8
+expected_eps_query_bits = 112.6
+expected_eps_ood_bits = 237.1
+expected_eps_claim_batch_bits = 120.9
+expected_eps_sumcheck_bits = 247.9
+expected_eps_consistency_batch_bits = 118.3
 
 [final_block]
 yr_log_n = 3
diff --git a/crates/flock-core/configs/ligerito/m22_fast128.toml b/crates/flock-core/configs/ligerito/m22_fast128.toml
deleted file mode 100644
index 671b38c7..00000000
--- a/crates/flock-core/configs/ligerito/m22_fast128.toml
+++ /dev/null
@@ -1,74 +0,0 @@
-m = 22
-log_n = 15
-initial_k = 6
-target_security_bits = 100
-analysis_version = "f256_split_johnson_two_point_ood_query128_c3_algebraic_row_union_over_bchks25_thm_4_6"
-field = "f256"
-hash = "sha256"
-grinding_step = "post_commit_pre_queries"
-
-[[levels]]
-log_inv_rate = 1
-log_msg_cols = 9
-log_num_interleaved = 6
-k_recursive = 6
-regime = "johnson_ood"
-eta = 0.02
-queries = 244
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
-consistency_batch_grinding_bits = 9
-ood_samples = 1
-target_security_bits = 100
-expected_eps_pg_bits = 219.0
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 238.3
-expected_eps_claim_batch_bits = 122.9
-expected_eps_sumcheck_bits = 249.9
-expected_eps_consistency_batch_bits = 119.9
-
-[[levels]]
-log_inv_rate = 3
-log_msg_cols = 6
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 79
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 223.8
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 238.1
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
-
-[[levels]]
-log_inv_rate = 5
-log_msg_cols = 3
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 48
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 10
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 225.8
-expected_eps_query_bits = 112.6
-expected_eps_ood_bits = 237.1
-expected_eps_claim_batch_bits = 120.9
-expected_eps_sumcheck_bits = 247.9
-expected_eps_consistency_batch_bits = 118.3
-
-[final_block]
-yr_log_n = 3
diff --git a/crates/flock-core/configs/ligerito/m22_slim.toml b/crates/flock-core/configs/ligerito/m22_slim.toml
index cccdce67..00de0c46 100644
--- a/crates/flock-core/configs/ligerito/m22_slim.toml
+++ b/crates/flock-core/configs/ligerito/m22_slim.toml
@@ -29,46 +29,46 @@ expected_eps_sumcheck_bits = 249.4
 expected_eps_consistency_batch_bits = 119.5
 
 [[levels]]
-log_inv_rate = 3
+log_inv_rate = 4
 log_msg_cols = 6
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 79
+queries = 60
 grinding_bits = 16
 fold_grinding_bits = 0
 claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 10
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 223.8
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 238.1
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
+expected_eps_pg_bits = 223.1
+expected_eps_query_bits = 113.3
+expected_eps_ood_bits = 237.1
+expected_eps_claim_batch_bits = 121.4
+expected_eps_sumcheck_bits = 248.4
+expected_eps_consistency_batch_bits = 118.8
 
 [[levels]]
-log_inv_rate = 4
+log_inv_rate = 6
 log_msg_cols = 3
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 60
+queries = 41
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 8
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 226.1
-expected_eps_query_bits = 113.3
-expected_eps_ood_bits = 238.1
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.8
+expected_eps_pg_bits = 224.7
+expected_eps_query_bits = 114.2
+expected_eps_ood_bits = 236.1
+expected_eps_claim_batch_bits = 120.4
+expected_eps_sumcheck_bits = 247.4
+expected_eps_consistency_batch_bits = 117.8
 
 [final_block]
 yr_log_n = 3
diff --git a/crates/flock-core/configs/ligerito/m22_slim128.toml b/crates/flock-core/configs/ligerito/m22_slim128.toml
deleted file mode 100644
index 00de0c46..00000000
--- a/crates/flock-core/configs/ligerito/m22_slim128.toml
+++ /dev/null
@@ -1,74 +0,0 @@
-m = 22
-log_n = 15
-initial_k = 6
-target_security_bits = 100
-analysis_version = "f256_split_johnson_two_point_ood_query128_c3_algebraic_row_union_over_bchks25_thm_4_6"
-field = "f256"
-hash = "sha256"
-grinding_step = "post_commit_pre_queries"
-
-[[levels]]
-log_inv_rate = 2
-log_msg_cols = 9
-log_num_interleaved = 6
-k_recursive = 6
-regime = "johnson_ood"
-eta = 0.02
-queries = 119
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
-consistency_batch_grinding_bits = 9
-ood_samples = 1
-target_security_bits = 100
-expected_eps_pg_bits = 218.8
-expected_eps_query_bits = 112.3
-expected_eps_ood_bits = 237.3
-expected_eps_claim_batch_bits = 122.4
-expected_eps_sumcheck_bits = 249.4
-expected_eps_consistency_batch_bits = 119.5
-
-[[levels]]
-log_inv_rate = 4
-log_msg_cols = 6
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 60
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 223.1
-expected_eps_query_bits = 113.3
-expected_eps_ood_bits = 237.1
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.8
-
-[[levels]]
-log_inv_rate = 6
-log_msg_cols = 3
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 41
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 224.7
-expected_eps_query_bits = 114.2
-expected_eps_ood_bits = 236.1
-expected_eps_claim_batch_bits = 120.4
-expected_eps_sumcheck_bits = 247.4
-expected_eps_consistency_batch_bits = 117.8
-
-[final_block]
-yr_log_n = 3
diff --git a/crates/flock-core/configs/ligerito/m23_fast.toml b/crates/flock-core/configs/ligerito/m23_fast.toml
index 2929c0b0..ba6f9dc1 100644
--- a/crates/flock-core/configs/ligerito/m23_fast.toml
+++ b/crates/flock-core/configs/ligerito/m23_fast.toml
@@ -14,61 +14,61 @@ log_num_interleaved = 6
 k_recursive = 6
 regime = "johnson_ood"
 eta = 0.02
-queries = 279
-grinding_bits = 0
+queries = 244
+grinding_bits = 16
 fold_grinding_bits = 0
 claim_batch_grinding_bits = 6
 consistency_batch_grinding_bits = 9
 ood_samples = 1
 target_security_bits = 100
 expected_eps_pg_bits = 218.0
-expected_eps_query_bits = 128.3
+expected_eps_query_bits = 112.2
 expected_eps_ood_bits = 238.2
 expected_eps_claim_batch_bits = 122.9
 expected_eps_sumcheck_bits = 249.9
-expected_eps_consistency_batch_bits = 119.7
+expected_eps_consistency_batch_bits = 119.9
 
 [[levels]]
-log_inv_rate = 2
+log_inv_rate = 3
 log_msg_cols = 7
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 136
-grinding_bits = 0
+queries = 79
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
+claim_batch_grinding_bits = 7
 consistency_batch_grinding_bits = 9
 ood_samples = 2
 target_security_bits = 100
 expected_eps_pg_bits = 222.8
-expected_eps_query_bits = 128.3
-expected_eps_ood_bits = 238.8
-expected_eps_claim_batch_bits = 122.4
-expected_eps_sumcheck_bits = 249.4
-expected_eps_consistency_batch_bits = 119.4
+expected_eps_query_bits = 112.2
+expected_eps_ood_bits = 237.8
+expected_eps_claim_batch_bits = 121.9
+expected_eps_sumcheck_bits = 248.9
+expected_eps_consistency_batch_bits = 119.0
 
 [[levels]]
-log_inv_rate = 3
+log_inv_rate = 5
 log_msg_cols = 4
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 91
-grinding_bits = 0
+queries = 48
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
+claim_batch_grinding_bits = 8
+consistency_batch_grinding_bits = 10
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 225.8
-expected_eps_query_bits = 129.3
-expected_eps_ood_bits = 238.7
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
+expected_eps_pg_bits = 224.8
+expected_eps_query_bits = 112.6
+expected_eps_ood_bits = 236.7
+expected_eps_claim_batch_bits = 120.9
+expected_eps_sumcheck_bits = 247.9
+expected_eps_consistency_batch_bits = 118.3
 
 [final_block]
 yr_log_n = 4
diff --git a/crates/flock-core/configs/ligerito/m23_fast128.toml b/crates/flock-core/configs/ligerito/m23_fast128.toml
deleted file mode 100644
index ba6f9dc1..00000000
--- a/crates/flock-core/configs/ligerito/m23_fast128.toml
+++ /dev/null
@@ -1,74 +0,0 @@
-m = 23
-log_n = 16
-initial_k = 6
-target_security_bits = 100
-analysis_version = "f256_split_johnson_two_point_ood_query128_c3_algebraic_row_union_over_bchks25_thm_4_6"
-field = "f256"
-hash = "sha256"
-grinding_step = "post_commit_pre_queries"
-
-[[levels]]
-log_inv_rate = 1
-log_msg_cols = 10
-log_num_interleaved = 6
-k_recursive = 6
-regime = "johnson_ood"
-eta = 0.02
-queries = 244
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
-consistency_batch_grinding_bits = 9
-ood_samples = 1
-target_security_bits = 100
-expected_eps_pg_bits = 218.0
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 238.2
-expected_eps_claim_batch_bits = 122.9
-expected_eps_sumcheck_bits = 249.9
-expected_eps_consistency_batch_bits = 119.9
-
-[[levels]]
-log_inv_rate = 3
-log_msg_cols = 7
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 79
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 222.8
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 237.8
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
-
-[[levels]]
-log_inv_rate = 5
-log_msg_cols = 4
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 48
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 10
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 224.8
-expected_eps_query_bits = 112.6
-expected_eps_ood_bits = 236.7
-expected_eps_claim_batch_bits = 120.9
-expected_eps_sumcheck_bits = 247.9
-expected_eps_consistency_batch_bits = 118.3
-
-[final_block]
-yr_log_n = 4
diff --git a/crates/flock-core/configs/ligerito/m23_slim.toml b/crates/flock-core/configs/ligerito/m23_slim.toml
index 48c58730..d92a406f 100644
--- a/crates/flock-core/configs/ligerito/m23_slim.toml
+++ b/crates/flock-core/configs/ligerito/m23_slim.toml
@@ -29,46 +29,46 @@ expected_eps_sumcheck_bits = 249.4
 expected_eps_consistency_batch_bits = 119.5
 
 [[levels]]
-log_inv_rate = 3
+log_inv_rate = 4
 log_msg_cols = 7
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 79
+queries = 60
 grinding_bits = 16
 fold_grinding_bits = 0
 claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 10
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 222.8
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 237.8
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
+expected_eps_pg_bits = 222.1
+expected_eps_query_bits = 113.3
+expected_eps_ood_bits = 236.8
+expected_eps_claim_batch_bits = 121.4
+expected_eps_sumcheck_bits = 248.4
+expected_eps_consistency_batch_bits = 118.8
 
 [[levels]]
-log_inv_rate = 4
+log_inv_rate = 6
 log_msg_cols = 4
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 60
+queries = 41
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 8
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 225.1
-expected_eps_query_bits = 113.3
-expected_eps_ood_bits = 237.7
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.8
+expected_eps_pg_bits = 223.7
+expected_eps_query_bits = 114.2
+expected_eps_ood_bits = 235.7
+expected_eps_claim_batch_bits = 120.4
+expected_eps_sumcheck_bits = 247.4
+expected_eps_consistency_batch_bits = 117.8
 
 [final_block]
 yr_log_n = 4
diff --git a/crates/flock-core/configs/ligerito/m23_slim128.toml b/crates/flock-core/configs/ligerito/m23_slim128.toml
deleted file mode 100644
index d92a406f..00000000
--- a/crates/flock-core/configs/ligerito/m23_slim128.toml
+++ /dev/null
@@ -1,74 +0,0 @@
-m = 23
-log_n = 16
-initial_k = 6
-target_security_bits = 100
-analysis_version = "f256_split_johnson_two_point_ood_query128_c3_algebraic_row_union_over_bchks25_thm_4_6"
-field = "f256"
-hash = "sha256"
-grinding_step = "post_commit_pre_queries"
-
-[[levels]]
-log_inv_rate = 2
-log_msg_cols = 10
-log_num_interleaved = 6
-k_recursive = 6
-regime = "johnson_ood"
-eta = 0.02
-queries = 119
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
-consistency_batch_grinding_bits = 9
-ood_samples = 1
-target_security_bits = 100
-expected_eps_pg_bits = 217.8
-expected_eps_query_bits = 112.3
-expected_eps_ood_bits = 237.2
-expected_eps_claim_batch_bits = 122.4
-expected_eps_sumcheck_bits = 249.4
-expected_eps_consistency_batch_bits = 119.5
-
-[[levels]]
-log_inv_rate = 4
-log_msg_cols = 7
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 60
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 222.1
-expected_eps_query_bits = 113.3
-expected_eps_ood_bits = 236.8
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.8
-
-[[levels]]
-log_inv_rate = 6
-log_msg_cols = 4
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 41
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 223.7
-expected_eps_query_bits = 114.2
-expected_eps_ood_bits = 235.7
-expected_eps_claim_batch_bits = 120.4
-expected_eps_sumcheck_bits = 247.4
-expected_eps_consistency_batch_bits = 117.8
-
-[final_block]
-yr_log_n = 4
diff --git a/crates/flock-core/configs/ligerito/m24_fast.toml b/crates/flock-core/configs/ligerito/m24_fast.toml
index 960df5c1..307fd9e5 100644
--- a/crates/flock-core/configs/ligerito/m24_fast.toml
+++ b/crates/flock-core/configs/ligerito/m24_fast.toml
@@ -14,61 +14,61 @@ log_num_interleaved = 6
 k_recursive = 6
 regime = "johnson_ood"
 eta = 0.02
-queries = 279
-grinding_bits = 0
+queries = 244
+grinding_bits = 16
 fold_grinding_bits = 0
 claim_batch_grinding_bits = 6
 consistency_batch_grinding_bits = 9
 ood_samples = 1
 target_security_bits = 100
 expected_eps_pg_bits = 217.0
-expected_eps_query_bits = 128.3
+expected_eps_query_bits = 112.2
 expected_eps_ood_bits = 238.0
 expected_eps_claim_batch_bits = 122.9
 expected_eps_sumcheck_bits = 249.9
-expected_eps_consistency_batch_bits = 119.7
+expected_eps_consistency_batch_bits = 119.9
 
 [[levels]]
-log_inv_rate = 2
+log_inv_rate = 3
 log_msg_cols = 8
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 136
-grinding_bits = 0
+queries = 79
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
+claim_batch_grinding_bits = 7
 consistency_batch_grinding_bits = 9
 ood_samples = 2
 target_security_bits = 100
 expected_eps_pg_bits = 221.8
-expected_eps_query_bits = 128.3
-expected_eps_ood_bits = 238.5
-expected_eps_claim_batch_bits = 122.4
-expected_eps_sumcheck_bits = 249.4
-expected_eps_consistency_batch_bits = 119.4
+expected_eps_query_bits = 112.2
+expected_eps_ood_bits = 237.5
+expected_eps_claim_batch_bits = 121.9
+expected_eps_sumcheck_bits = 248.9
+expected_eps_consistency_batch_bits = 119.0
 
 [[levels]]
-log_inv_rate = 3
+log_inv_rate = 5
 log_msg_cols = 5
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 91
-grinding_bits = 0
+queries = 48
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
+claim_batch_grinding_bits = 8
+consistency_batch_grinding_bits = 10
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 224.8
-expected_eps_query_bits = 129.3
-expected_eps_ood_bits = 238.4
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
+expected_eps_pg_bits = 223.8
+expected_eps_query_bits = 112.6
+expected_eps_ood_bits = 236.4
+expected_eps_claim_batch_bits = 120.9
+expected_eps_sumcheck_bits = 247.9
+expected_eps_consistency_batch_bits = 118.3
 
 [final_block]
 yr_log_n = 5
diff --git a/crates/flock-core/configs/ligerito/m24_fast128.toml b/crates/flock-core/configs/ligerito/m24_fast128.toml
deleted file mode 100644
index 307fd9e5..00000000
--- a/crates/flock-core/configs/ligerito/m24_fast128.toml
+++ /dev/null
@@ -1,74 +0,0 @@
-m = 24
-log_n = 17
-initial_k = 6
-target_security_bits = 100
-analysis_version = "f256_split_johnson_two_point_ood_query128_c3_algebraic_row_union_over_bchks25_thm_4_6"
-field = "f256"
-hash = "sha256"
-grinding_step = "post_commit_pre_queries"
-
-[[levels]]
-log_inv_rate = 1
-log_msg_cols = 11
-log_num_interleaved = 6
-k_recursive = 6
-regime = "johnson_ood"
-eta = 0.02
-queries = 244
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
-consistency_batch_grinding_bits = 9
-ood_samples = 1
-target_security_bits = 100
-expected_eps_pg_bits = 217.0
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 238.0
-expected_eps_claim_batch_bits = 122.9
-expected_eps_sumcheck_bits = 249.9
-expected_eps_consistency_batch_bits = 119.9
-
-[[levels]]
-log_inv_rate = 3
-log_msg_cols = 8
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 79
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 221.8
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 237.5
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
-
-[[levels]]
-log_inv_rate = 5
-log_msg_cols = 5
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 48
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 10
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 223.8
-expected_eps_query_bits = 112.6
-expected_eps_ood_bits = 236.4
-expected_eps_claim_batch_bits = 120.9
-expected_eps_sumcheck_bits = 247.9
-expected_eps_consistency_batch_bits = 118.3
-
-[final_block]
-yr_log_n = 5
diff --git a/crates/flock-core/configs/ligerito/m24_slim.toml b/crates/flock-core/configs/ligerito/m24_slim.toml
index c90e9b42..87b501b7 100644
--- a/crates/flock-core/configs/ligerito/m24_slim.toml
+++ b/crates/flock-core/configs/ligerito/m24_slim.toml
@@ -29,46 +29,46 @@ expected_eps_sumcheck_bits = 249.4
 expected_eps_consistency_batch_bits = 119.5
 
 [[levels]]
-log_inv_rate = 3
+log_inv_rate = 4
 log_msg_cols = 8
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 79
+queries = 60
 grinding_bits = 16
 fold_grinding_bits = 0
 claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 10
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 221.8
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 237.5
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
+expected_eps_pg_bits = 221.1
+expected_eps_query_bits = 113.3
+expected_eps_ood_bits = 236.5
+expected_eps_claim_batch_bits = 121.4
+expected_eps_sumcheck_bits = 248.4
+expected_eps_consistency_batch_bits = 118.8
 
 [[levels]]
-log_inv_rate = 4
+log_inv_rate = 6
 log_msg_cols = 5
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 60
+queries = 41
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 8
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 224.1
-expected_eps_query_bits = 113.3
-expected_eps_ood_bits = 237.4
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.8
+expected_eps_pg_bits = 222.7
+expected_eps_query_bits = 114.2
+expected_eps_ood_bits = 235.4
+expected_eps_claim_batch_bits = 120.4
+expected_eps_sumcheck_bits = 247.4
+expected_eps_consistency_batch_bits = 117.8
 
 [final_block]
 yr_log_n = 5
diff --git a/crates/flock-core/configs/ligerito/m24_slim128.toml b/crates/flock-core/configs/ligerito/m24_slim128.toml
deleted file mode 100644
index 87b501b7..00000000
--- a/crates/flock-core/configs/ligerito/m24_slim128.toml
+++ /dev/null
@@ -1,74 +0,0 @@
-m = 24
-log_n = 17
-initial_k = 6
-target_security_bits = 100
-analysis_version = "f256_split_johnson_two_point_ood_query128_c3_algebraic_row_union_over_bchks25_thm_4_6"
-field = "f256"
-hash = "sha256"
-grinding_step = "post_commit_pre_queries"
-
-[[levels]]
-log_inv_rate = 2
-log_msg_cols = 11
-log_num_interleaved = 6
-k_recursive = 6
-regime = "johnson_ood"
-eta = 0.02
-queries = 119
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
-consistency_batch_grinding_bits = 9
-ood_samples = 1
-target_security_bits = 100
-expected_eps_pg_bits = 216.8
-expected_eps_query_bits = 112.3
-expected_eps_ood_bits = 237.0
-expected_eps_claim_batch_bits = 122.4
-expected_eps_sumcheck_bits = 249.4
-expected_eps_consistency_batch_bits = 119.5
-
-[[levels]]
-log_inv_rate = 4
-log_msg_cols = 8
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 60
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 221.1
-expected_eps_query_bits = 113.3
-expected_eps_ood_bits = 236.5
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.8
-
-[[levels]]
-log_inv_rate = 6
-log_msg_cols = 5
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 41
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 222.7
-expected_eps_query_bits = 114.2
-expected_eps_ood_bits = 235.4
-expected_eps_claim_batch_bits = 120.4
-expected_eps_sumcheck_bits = 247.4
-expected_eps_consistency_batch_bits = 117.8
-
-[final_block]
-yr_log_n = 5
diff --git a/crates/flock-core/configs/ligerito/m25_fast.toml b/crates/flock-core/configs/ligerito/m25_fast.toml
index b19aaa67..b3078527 100644
--- a/crates/flock-core/configs/ligerito/m25_fast.toml
+++ b/crates/flock-core/configs/ligerito/m25_fast.toml
@@ -14,82 +14,82 @@ log_num_interleaved = 6
 k_recursive = 6
 regime = "johnson_ood"
 eta = 0.02
-queries = 279
-grinding_bits = 0
+queries = 244
+grinding_bits = 16
 fold_grinding_bits = 0
 claim_batch_grinding_bits = 6
 consistency_batch_grinding_bits = 9
 ood_samples = 1
 target_security_bits = 100
 expected_eps_pg_bits = 216.0
-expected_eps_query_bits = 128.3
+expected_eps_query_bits = 112.2
 expected_eps_ood_bits = 237.9
 expected_eps_claim_batch_bits = 122.9
 expected_eps_sumcheck_bits = 249.9
-expected_eps_consistency_batch_bits = 119.7
+expected_eps_consistency_batch_bits = 119.9
 
 [[levels]]
-log_inv_rate = 2
+log_inv_rate = 3
 log_msg_cols = 9
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 136
-grinding_bits = 0
+queries = 79
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
+claim_batch_grinding_bits = 7
 consistency_batch_grinding_bits = 9
 ood_samples = 2
 target_security_bits = 100
 expected_eps_pg_bits = 220.8
-expected_eps_query_bits = 128.3
-expected_eps_ood_bits = 238.3
-expected_eps_claim_batch_bits = 122.4
-expected_eps_sumcheck_bits = 249.4
-expected_eps_consistency_batch_bits = 119.4
+expected_eps_query_bits = 112.2
+expected_eps_ood_bits = 237.3
+expected_eps_claim_batch_bits = 121.9
+expected_eps_sumcheck_bits = 248.9
+expected_eps_consistency_batch_bits = 119.0
 
 [[levels]]
-log_inv_rate = 3
+log_inv_rate = 5
 log_msg_cols = 6
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 91
-grinding_bits = 0
+queries = 48
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
+claim_batch_grinding_bits = 8
+consistency_batch_grinding_bits = 10
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 223.8
-expected_eps_query_bits = 129.3
-expected_eps_ood_bits = 238.1
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
+expected_eps_pg_bits = 222.8
+expected_eps_query_bits = 112.6
+expected_eps_ood_bits = 236.1
+expected_eps_claim_batch_bits = 120.9
+expected_eps_sumcheck_bits = 247.9
+expected_eps_consistency_batch_bits = 118.3
 
 [[levels]]
-log_inv_rate = 4
+log_inv_rate = 7
 log_msg_cols = 3
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 68
-grinding_bits = 0
+queries = 35
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 226.1
-expected_eps_query_bits = 128.4
-expected_eps_ood_bits = 238.1
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.5
+expected_eps_pg_bits = 224.0
+expected_eps_query_bits = 112.2
+expected_eps_ood_bits = 235.1
+expected_eps_claim_batch_bits = 119.9
+expected_eps_sumcheck_bits = 246.9
+expected_eps_consistency_batch_bits = 117.3
 
 [final_block]
 yr_log_n = 3
diff --git a/crates/flock-core/configs/ligerito/m25_fast128.toml b/crates/flock-core/configs/ligerito/m25_fast128.toml
deleted file mode 100644
index b3078527..00000000
--- a/crates/flock-core/configs/ligerito/m25_fast128.toml
+++ /dev/null
@@ -1,95 +0,0 @@
-m = 25
-log_n = 18
-initial_k = 6
-target_security_bits = 100
-analysis_version = "f256_split_johnson_two_point_ood_query128_c3_algebraic_row_union_over_bchks25_thm_4_6"
-field = "f256"
-hash = "sha256"
-grinding_step = "post_commit_pre_queries"
-
-[[levels]]
-log_inv_rate = 1
-log_msg_cols = 12
-log_num_interleaved = 6
-k_recursive = 6
-regime = "johnson_ood"
-eta = 0.02
-queries = 244
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
-consistency_batch_grinding_bits = 9
-ood_samples = 1
-target_security_bits = 100
-expected_eps_pg_bits = 216.0
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 237.9
-expected_eps_claim_batch_bits = 122.9
-expected_eps_sumcheck_bits = 249.9
-expected_eps_consistency_batch_bits = 119.9
-
-[[levels]]
-log_inv_rate = 3
-log_msg_cols = 9
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 79
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 220.8
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 237.3
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
-
-[[levels]]
-log_inv_rate = 5
-log_msg_cols = 6
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 48
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 10
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 222.8
-expected_eps_query_bits = 112.6
-expected_eps_ood_bits = 236.1
-expected_eps_claim_batch_bits = 120.9
-expected_eps_sumcheck_bits = 247.9
-expected_eps_consistency_batch_bits = 118.3
-
-[[levels]]
-log_inv_rate = 7
-log_msg_cols = 3
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 35
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 9
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 224.0
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 235.1
-expected_eps_claim_batch_bits = 119.9
-expected_eps_sumcheck_bits = 246.9
-expected_eps_consistency_batch_bits = 117.3
-
-[final_block]
-yr_log_n = 3
diff --git a/crates/flock-core/configs/ligerito/m25_slim.toml b/crates/flock-core/configs/ligerito/m25_slim.toml
index 4fae3c55..7f08eb0c 100644
--- a/crates/flock-core/configs/ligerito/m25_slim.toml
+++ b/crates/flock-core/configs/ligerito/m25_slim.toml
@@ -29,67 +29,67 @@ expected_eps_sumcheck_bits = 249.4
 expected_eps_consistency_batch_bits = 119.5
 
 [[levels]]
-log_inv_rate = 3
+log_inv_rate = 4
 log_msg_cols = 9
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 79
+queries = 60
 grinding_bits = 16
 fold_grinding_bits = 0
 claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 10
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 220.8
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 237.3
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
+expected_eps_pg_bits = 220.1
+expected_eps_query_bits = 113.3
+expected_eps_ood_bits = 236.3
+expected_eps_claim_batch_bits = 121.4
+expected_eps_sumcheck_bits = 248.4
+expected_eps_consistency_batch_bits = 118.8
 
 [[levels]]
-log_inv_rate = 4
+log_inv_rate = 6
 log_msg_cols = 6
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 60
+queries = 41
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 8
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 223.1
-expected_eps_query_bits = 113.3
-expected_eps_ood_bits = 237.1
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.8
+expected_eps_pg_bits = 221.7
+expected_eps_query_bits = 114.2
+expected_eps_ood_bits = 235.1
+expected_eps_claim_batch_bits = 120.4
+expected_eps_sumcheck_bits = 247.4
+expected_eps_consistency_batch_bits = 117.8
 
 [[levels]]
-log_inv_rate = 5
+log_inv_rate = 8
 log_msg_cols = 3
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 48
+queries = 32
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 225.8
-expected_eps_query_bits = 112.6
-expected_eps_ood_bits = 237.1
-expected_eps_claim_batch_bits = 120.9
-expected_eps_sumcheck_bits = 247.9
-expected_eps_consistency_batch_bits = 118.3
+expected_eps_pg_bits = 221.5
+expected_eps_query_bits = 115.2
+expected_eps_ood_bits = 234.1
+expected_eps_claim_batch_bits = 119.4
+expected_eps_sumcheck_bits = 246.4
+expected_eps_consistency_batch_bits = 117.0
 
 [final_block]
 yr_log_n = 3
diff --git a/crates/flock-core/configs/ligerito/m25_slim128.toml b/crates/flock-core/configs/ligerito/m25_slim128.toml
deleted file mode 100644
index 7f08eb0c..00000000
--- a/crates/flock-core/configs/ligerito/m25_slim128.toml
+++ /dev/null
@@ -1,95 +0,0 @@
-m = 25
-log_n = 18
-initial_k = 6
-target_security_bits = 100
-analysis_version = "f256_split_johnson_two_point_ood_query128_c3_algebraic_row_union_over_bchks25_thm_4_6"
-field = "f256"
-hash = "sha256"
-grinding_step = "post_commit_pre_queries"
-
-[[levels]]
-log_inv_rate = 2
-log_msg_cols = 12
-log_num_interleaved = 6
-k_recursive = 6
-regime = "johnson_ood"
-eta = 0.02
-queries = 119
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
-consistency_batch_grinding_bits = 9
-ood_samples = 1
-target_security_bits = 100
-expected_eps_pg_bits = 215.8
-expected_eps_query_bits = 112.3
-expected_eps_ood_bits = 236.9
-expected_eps_claim_batch_bits = 122.4
-expected_eps_sumcheck_bits = 249.4
-expected_eps_consistency_batch_bits = 119.5
-
-[[levels]]
-log_inv_rate = 4
-log_msg_cols = 9
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 60
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 220.1
-expected_eps_query_bits = 113.3
-expected_eps_ood_bits = 236.3
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.8
-
-[[levels]]
-log_inv_rate = 6
-log_msg_cols = 6
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 41
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 221.7
-expected_eps_query_bits = 114.2
-expected_eps_ood_bits = 235.1
-expected_eps_claim_batch_bits = 120.4
-expected_eps_sumcheck_bits = 247.4
-expected_eps_consistency_batch_bits = 117.8
-
-[[levels]]
-log_inv_rate = 8
-log_msg_cols = 3
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 32
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 9
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 221.5
-expected_eps_query_bits = 115.2
-expected_eps_ood_bits = 234.1
-expected_eps_claim_batch_bits = 119.4
-expected_eps_sumcheck_bits = 246.4
-expected_eps_consistency_batch_bits = 117.0
-
-[final_block]
-yr_log_n = 3
diff --git a/crates/flock-core/configs/ligerito/m26_fast.toml b/crates/flock-core/configs/ligerito/m26_fast.toml
index 98442a0e..ad895774 100644
--- a/crates/flock-core/configs/ligerito/m26_fast.toml
+++ b/crates/flock-core/configs/ligerito/m26_fast.toml
@@ -14,82 +14,82 @@ log_num_interleaved = 6
 k_recursive = 6
 regime = "johnson_ood"
 eta = 0.02
-queries = 279
-grinding_bits = 0
+queries = 244
+grinding_bits = 16
 fold_grinding_bits = 0
 claim_batch_grinding_bits = 6
 consistency_batch_grinding_bits = 9
 ood_samples = 1
 target_security_bits = 100
 expected_eps_pg_bits = 215.0
-expected_eps_query_bits = 128.3
+expected_eps_query_bits = 112.2
 expected_eps_ood_bits = 237.8
 expected_eps_claim_batch_bits = 122.9
 expected_eps_sumcheck_bits = 249.9
-expected_eps_consistency_batch_bits = 119.7
+expected_eps_consistency_batch_bits = 119.9
 
 [[levels]]
-log_inv_rate = 2
+log_inv_rate = 3
 log_msg_cols = 10
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 136
-grinding_bits = 0
+queries = 79
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
+claim_batch_grinding_bits = 7
 consistency_batch_grinding_bits = 9
 ood_samples = 2
 target_security_bits = 100
 expected_eps_pg_bits = 219.8
-expected_eps_query_bits = 128.3
-expected_eps_ood_bits = 238.1
-expected_eps_claim_batch_bits = 122.4
-expected_eps_sumcheck_bits = 249.4
-expected_eps_consistency_batch_bits = 119.4
+expected_eps_query_bits = 112.2
+expected_eps_ood_bits = 237.1
+expected_eps_claim_batch_bits = 121.9
+expected_eps_sumcheck_bits = 248.9
+expected_eps_consistency_batch_bits = 119.0
 
 [[levels]]
-log_inv_rate = 3
+log_inv_rate = 5
 log_msg_cols = 7
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 91
-grinding_bits = 0
+queries = 48
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
+claim_batch_grinding_bits = 8
+consistency_batch_grinding_bits = 10
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 222.8
-expected_eps_query_bits = 129.3
-expected_eps_ood_bits = 237.8
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
+expected_eps_pg_bits = 221.8
+expected_eps_query_bits = 112.6
+expected_eps_ood_bits = 235.8
+expected_eps_claim_batch_bits = 120.9
+expected_eps_sumcheck_bits = 247.9
+expected_eps_consistency_batch_bits = 118.3
 
 [[levels]]
-log_inv_rate = 4
+log_inv_rate = 7
 log_msg_cols = 4
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 68
-grinding_bits = 0
+queries = 35
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 225.1
-expected_eps_query_bits = 128.4
-expected_eps_ood_bits = 237.7
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.5
+expected_eps_pg_bits = 223.0
+expected_eps_query_bits = 112.2
+expected_eps_ood_bits = 234.7
+expected_eps_claim_batch_bits = 119.9
+expected_eps_sumcheck_bits = 246.9
+expected_eps_consistency_batch_bits = 117.3
 
 [final_block]
 yr_log_n = 4
diff --git a/crates/flock-core/configs/ligerito/m26_fast128.toml b/crates/flock-core/configs/ligerito/m26_fast128.toml
deleted file mode 100644
index ad895774..00000000
--- a/crates/flock-core/configs/ligerito/m26_fast128.toml
+++ /dev/null
@@ -1,95 +0,0 @@
-m = 26
-log_n = 19
-initial_k = 6
-target_security_bits = 100
-analysis_version = "f256_split_johnson_two_point_ood_query128_c3_algebraic_row_union_over_bchks25_thm_4_6"
-field = "f256"
-hash = "sha256"
-grinding_step = "post_commit_pre_queries"
-
-[[levels]]
-log_inv_rate = 1
-log_msg_cols = 13
-log_num_interleaved = 6
-k_recursive = 6
-regime = "johnson_ood"
-eta = 0.02
-queries = 244
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
-consistency_batch_grinding_bits = 9
-ood_samples = 1
-target_security_bits = 100
-expected_eps_pg_bits = 215.0
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 237.8
-expected_eps_claim_batch_bits = 122.9
-expected_eps_sumcheck_bits = 249.9
-expected_eps_consistency_batch_bits = 119.9
-
-[[levels]]
-log_inv_rate = 3
-log_msg_cols = 10
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 79
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 219.8
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 237.1
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
-
-[[levels]]
-log_inv_rate = 5
-log_msg_cols = 7
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 48
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 10
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 221.8
-expected_eps_query_bits = 112.6
-expected_eps_ood_bits = 235.8
-expected_eps_claim_batch_bits = 120.9
-expected_eps_sumcheck_bits = 247.9
-expected_eps_consistency_batch_bits = 118.3
-
-[[levels]]
-log_inv_rate = 7
-log_msg_cols = 4
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 35
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 9
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 223.0
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 234.7
-expected_eps_claim_batch_bits = 119.9
-expected_eps_sumcheck_bits = 246.9
-expected_eps_consistency_batch_bits = 117.3
-
-[final_block]
-yr_log_n = 4
diff --git a/crates/flock-core/configs/ligerito/m26_slim.toml b/crates/flock-core/configs/ligerito/m26_slim.toml
index 5d2cde51..c0bb50ea 100644
--- a/crates/flock-core/configs/ligerito/m26_slim.toml
+++ b/crates/flock-core/configs/ligerito/m26_slim.toml
@@ -29,67 +29,67 @@ expected_eps_sumcheck_bits = 249.4
 expected_eps_consistency_batch_bits = 119.5
 
 [[levels]]
-log_inv_rate = 3
+log_inv_rate = 4
 log_msg_cols = 10
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 79
+queries = 60
 grinding_bits = 16
 fold_grinding_bits = 0
 claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 10
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 219.8
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 237.1
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
+expected_eps_pg_bits = 219.1
+expected_eps_query_bits = 113.3
+expected_eps_ood_bits = 236.1
+expected_eps_claim_batch_bits = 121.4
+expected_eps_sumcheck_bits = 248.4
+expected_eps_consistency_batch_bits = 118.8
 
 [[levels]]
-log_inv_rate = 4
+log_inv_rate = 6
 log_msg_cols = 7
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 60
+queries = 41
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 8
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 222.1
-expected_eps_query_bits = 113.3
-expected_eps_ood_bits = 236.8
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.8
+expected_eps_pg_bits = 220.7
+expected_eps_query_bits = 114.2
+expected_eps_ood_bits = 234.8
+expected_eps_claim_batch_bits = 120.4
+expected_eps_sumcheck_bits = 247.4
+expected_eps_consistency_batch_bits = 117.8
 
 [[levels]]
-log_inv_rate = 5
+log_inv_rate = 8
 log_msg_cols = 4
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 48
+queries = 32
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 224.8
-expected_eps_query_bits = 112.6
-expected_eps_ood_bits = 236.7
-expected_eps_claim_batch_bits = 120.9
-expected_eps_sumcheck_bits = 247.9
-expected_eps_consistency_batch_bits = 118.3
+expected_eps_pg_bits = 220.5
+expected_eps_query_bits = 115.2
+expected_eps_ood_bits = 233.7
+expected_eps_claim_batch_bits = 119.4
+expected_eps_sumcheck_bits = 246.4
+expected_eps_consistency_batch_bits = 117.0
 
 [final_block]
 yr_log_n = 4
diff --git a/crates/flock-core/configs/ligerito/m26_slim128.toml b/crates/flock-core/configs/ligerito/m26_slim128.toml
deleted file mode 100644
index c0bb50ea..00000000
--- a/crates/flock-core/configs/ligerito/m26_slim128.toml
+++ /dev/null
@@ -1,95 +0,0 @@
-m = 26
-log_n = 19
-initial_k = 6
-target_security_bits = 100
-analysis_version = "f256_split_johnson_two_point_ood_query128_c3_algebraic_row_union_over_bchks25_thm_4_6"
-field = "f256"
-hash = "sha256"
-grinding_step = "post_commit_pre_queries"
-
-[[levels]]
-log_inv_rate = 2
-log_msg_cols = 13
-log_num_interleaved = 6
-k_recursive = 6
-regime = "johnson_ood"
-eta = 0.02
-queries = 119
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
-consistency_batch_grinding_bits = 9
-ood_samples = 1
-target_security_bits = 100
-expected_eps_pg_bits = 214.8
-expected_eps_query_bits = 112.3
-expected_eps_ood_bits = 236.8
-expected_eps_claim_batch_bits = 122.4
-expected_eps_sumcheck_bits = 249.4
-expected_eps_consistency_batch_bits = 119.5
-
-[[levels]]
-log_inv_rate = 4
-log_msg_cols = 10
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 60
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 219.1
-expected_eps_query_bits = 113.3
-expected_eps_ood_bits = 236.1
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.8
-
-[[levels]]
-log_inv_rate = 6
-log_msg_cols = 7
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 41
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 220.7
-expected_eps_query_bits = 114.2
-expected_eps_ood_bits = 234.8
-expected_eps_claim_batch_bits = 120.4
-expected_eps_sumcheck_bits = 247.4
-expected_eps_consistency_batch_bits = 117.8
-
-[[levels]]
-log_inv_rate = 8
-log_msg_cols = 4
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 32
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 9
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 220.5
-expected_eps_query_bits = 115.2
-expected_eps_ood_bits = 233.7
-expected_eps_claim_batch_bits = 119.4
-expected_eps_sumcheck_bits = 246.4
-expected_eps_consistency_batch_bits = 117.0
-
-[final_block]
-yr_log_n = 4
diff --git a/crates/flock-core/configs/ligerito/m27_fast.toml b/crates/flock-core/configs/ligerito/m27_fast.toml
index 50e45b61..9a88fea0 100644
--- a/crates/flock-core/configs/ligerito/m27_fast.toml
+++ b/crates/flock-core/configs/ligerito/m27_fast.toml
@@ -14,82 +14,82 @@ log_num_interleaved = 6
 k_recursive = 6
 regime = "johnson_ood"
 eta = 0.02
-queries = 279
-grinding_bits = 0
+queries = 244
+grinding_bits = 16
 fold_grinding_bits = 0
 claim_batch_grinding_bits = 6
 consistency_batch_grinding_bits = 9
 ood_samples = 1
 target_security_bits = 100
 expected_eps_pg_bits = 214.0
-expected_eps_query_bits = 128.3
+expected_eps_query_bits = 112.2
 expected_eps_ood_bits = 237.6
 expected_eps_claim_batch_bits = 122.9
 expected_eps_sumcheck_bits = 249.9
-expected_eps_consistency_batch_bits = 119.7
+expected_eps_consistency_batch_bits = 119.9
 
 [[levels]]
-log_inv_rate = 2
+log_inv_rate = 3
 log_msg_cols = 11
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 136
-grinding_bits = 0
+queries = 79
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
+claim_batch_grinding_bits = 7
 consistency_batch_grinding_bits = 9
 ood_samples = 2
 target_security_bits = 100
 expected_eps_pg_bits = 218.8
-expected_eps_query_bits = 128.3
-expected_eps_ood_bits = 237.9
-expected_eps_claim_batch_bits = 122.4
-expected_eps_sumcheck_bits = 249.4
-expected_eps_consistency_batch_bits = 119.4
+expected_eps_query_bits = 112.2
+expected_eps_ood_bits = 236.9
+expected_eps_claim_batch_bits = 121.9
+expected_eps_sumcheck_bits = 248.9
+expected_eps_consistency_batch_bits = 119.0
 
 [[levels]]
-log_inv_rate = 3
+log_inv_rate = 5
 log_msg_cols = 8
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 91
-grinding_bits = 0
+queries = 48
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
+claim_batch_grinding_bits = 8
+consistency_batch_grinding_bits = 10
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 221.8
-expected_eps_query_bits = 129.3
-expected_eps_ood_bits = 237.5
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
+expected_eps_pg_bits = 220.8
+expected_eps_query_bits = 112.6
+expected_eps_ood_bits = 235.5
+expected_eps_claim_batch_bits = 120.9
+expected_eps_sumcheck_bits = 247.9
+expected_eps_consistency_batch_bits = 118.3
 
 [[levels]]
-log_inv_rate = 4
+log_inv_rate = 7
 log_msg_cols = 5
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 68
-grinding_bits = 0
+queries = 35
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 224.1
-expected_eps_query_bits = 128.4
-expected_eps_ood_bits = 237.4
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.5
+expected_eps_pg_bits = 222.0
+expected_eps_query_bits = 112.2
+expected_eps_ood_bits = 234.4
+expected_eps_claim_batch_bits = 119.9
+expected_eps_sumcheck_bits = 246.9
+expected_eps_consistency_batch_bits = 117.3
 
 [final_block]
 yr_log_n = 5
diff --git a/crates/flock-core/configs/ligerito/m27_fast128.toml b/crates/flock-core/configs/ligerito/m27_fast128.toml
deleted file mode 100644
index 9a88fea0..00000000
--- a/crates/flock-core/configs/ligerito/m27_fast128.toml
+++ /dev/null
@@ -1,95 +0,0 @@
-m = 27
-log_n = 20
-initial_k = 6
-target_security_bits = 100
-analysis_version = "f256_split_johnson_two_point_ood_query128_c3_algebraic_row_union_over_bchks25_thm_4_6"
-field = "f256"
-hash = "sha256"
-grinding_step = "post_commit_pre_queries"
-
-[[levels]]
-log_inv_rate = 1
-log_msg_cols = 14
-log_num_interleaved = 6
-k_recursive = 6
-regime = "johnson_ood"
-eta = 0.02
-queries = 244
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
-consistency_batch_grinding_bits = 9
-ood_samples = 1
-target_security_bits = 100
-expected_eps_pg_bits = 214.0
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 237.6
-expected_eps_claim_batch_bits = 122.9
-expected_eps_sumcheck_bits = 249.9
-expected_eps_consistency_batch_bits = 119.9
-
-[[levels]]
-log_inv_rate = 3
-log_msg_cols = 11
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 79
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 218.8
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 236.9
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
-
-[[levels]]
-log_inv_rate = 5
-log_msg_cols = 8
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 48
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 10
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 220.8
-expected_eps_query_bits = 112.6
-expected_eps_ood_bits = 235.5
-expected_eps_claim_batch_bits = 120.9
-expected_eps_sumcheck_bits = 247.9
-expected_eps_consistency_batch_bits = 118.3
-
-[[levels]]
-log_inv_rate = 7
-log_msg_cols = 5
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 35
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 9
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 222.0
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 234.4
-expected_eps_claim_batch_bits = 119.9
-expected_eps_sumcheck_bits = 246.9
-expected_eps_consistency_batch_bits = 117.3
-
-[final_block]
-yr_log_n = 5
diff --git a/crates/flock-core/configs/ligerito/m27_slim.toml b/crates/flock-core/configs/ligerito/m27_slim.toml
index 0d24de71..44e765be 100644
--- a/crates/flock-core/configs/ligerito/m27_slim.toml
+++ b/crates/flock-core/configs/ligerito/m27_slim.toml
@@ -29,67 +29,67 @@ expected_eps_sumcheck_bits = 249.4
 expected_eps_consistency_batch_bits = 119.5
 
 [[levels]]
-log_inv_rate = 3
+log_inv_rate = 4
 log_msg_cols = 11
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 79
+queries = 60
 grinding_bits = 16
 fold_grinding_bits = 0
 claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 10
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 218.8
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 236.9
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
+expected_eps_pg_bits = 218.1
+expected_eps_query_bits = 113.3
+expected_eps_ood_bits = 235.9
+expected_eps_claim_batch_bits = 121.4
+expected_eps_sumcheck_bits = 248.4
+expected_eps_consistency_batch_bits = 118.8
 
 [[levels]]
-log_inv_rate = 4
+log_inv_rate = 6
 log_msg_cols = 8
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 60
+queries = 41
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 8
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 221.1
-expected_eps_query_bits = 113.3
-expected_eps_ood_bits = 236.5
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.8
+expected_eps_pg_bits = 219.7
+expected_eps_query_bits = 114.2
+expected_eps_ood_bits = 234.5
+expected_eps_claim_batch_bits = 120.4
+expected_eps_sumcheck_bits = 247.4
+expected_eps_consistency_batch_bits = 117.8
 
 [[levels]]
-log_inv_rate = 5
+log_inv_rate = 8
 log_msg_cols = 5
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 48
+queries = 32
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 223.8
-expected_eps_query_bits = 112.6
-expected_eps_ood_bits = 236.4
-expected_eps_claim_batch_bits = 120.9
-expected_eps_sumcheck_bits = 247.9
-expected_eps_consistency_batch_bits = 118.3
+expected_eps_pg_bits = 219.5
+expected_eps_query_bits = 115.2
+expected_eps_ood_bits = 233.4
+expected_eps_claim_batch_bits = 119.4
+expected_eps_sumcheck_bits = 246.4
+expected_eps_consistency_batch_bits = 117.0
 
 [final_block]
 yr_log_n = 5
diff --git a/crates/flock-core/configs/ligerito/m27_slim128.toml b/crates/flock-core/configs/ligerito/m27_slim128.toml
deleted file mode 100644
index 44e765be..00000000
--- a/crates/flock-core/configs/ligerito/m27_slim128.toml
+++ /dev/null
@@ -1,95 +0,0 @@
-m = 27
-log_n = 20
-initial_k = 6
-target_security_bits = 100
-analysis_version = "f256_split_johnson_two_point_ood_query128_c3_algebraic_row_union_over_bchks25_thm_4_6"
-field = "f256"
-hash = "sha256"
-grinding_step = "post_commit_pre_queries"
-
-[[levels]]
-log_inv_rate = 2
-log_msg_cols = 14
-log_num_interleaved = 6
-k_recursive = 6
-regime = "johnson_ood"
-eta = 0.02
-queries = 119
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
-consistency_batch_grinding_bits = 9
-ood_samples = 1
-target_security_bits = 100
-expected_eps_pg_bits = 213.8
-expected_eps_query_bits = 112.3
-expected_eps_ood_bits = 236.6
-expected_eps_claim_batch_bits = 122.4
-expected_eps_sumcheck_bits = 249.4
-expected_eps_consistency_batch_bits = 119.5
-
-[[levels]]
-log_inv_rate = 4
-log_msg_cols = 11
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 60
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 218.1
-expected_eps_query_bits = 113.3
-expected_eps_ood_bits = 235.9
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.8
-
-[[levels]]
-log_inv_rate = 6
-log_msg_cols = 8
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 41
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 219.7
-expected_eps_query_bits = 114.2
-expected_eps_ood_bits = 234.5
-expected_eps_claim_batch_bits = 120.4
-expected_eps_sumcheck_bits = 247.4
-expected_eps_consistency_batch_bits = 117.8
-
-[[levels]]
-log_inv_rate = 8
-log_msg_cols = 5
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 32
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 9
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 219.5
-expected_eps_query_bits = 115.2
-expected_eps_ood_bits = 233.4
-expected_eps_claim_batch_bits = 119.4
-expected_eps_sumcheck_bits = 246.4
-expected_eps_consistency_batch_bits = 117.0
-
-[final_block]
-yr_log_n = 5
diff --git a/crates/flock-core/configs/ligerito/m28_fast.toml b/crates/flock-core/configs/ligerito/m28_fast.toml
index c40a0956..2ad0b64f 100644
--- a/crates/flock-core/configs/ligerito/m28_fast.toml
+++ b/crates/flock-core/configs/ligerito/m28_fast.toml
@@ -14,103 +14,103 @@ log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 279
-grinding_bits = 0
+queries = 244
+grinding_bits = 16
 fold_grinding_bits = 0
 claim_batch_grinding_bits = 6
 consistency_batch_grinding_bits = 9
 ood_samples = 1
 target_security_bits = 100
 expected_eps_pg_bits = 213.0
-expected_eps_query_bits = 128.3
+expected_eps_query_bits = 112.2
 expected_eps_ood_bits = 237.5
 expected_eps_claim_batch_bits = 122.9
 expected_eps_sumcheck_bits = 249.9
-expected_eps_consistency_batch_bits = 119.7
+expected_eps_consistency_batch_bits = 119.9
 
 [[levels]]
-log_inv_rate = 2
+log_inv_rate = 3
 log_msg_cols = 14
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 136
-grinding_bits = 0
+queries = 79
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
+claim_batch_grinding_bits = 7
 consistency_batch_grinding_bits = 9
 ood_samples = 2
 target_security_bits = 100
 expected_eps_pg_bits = 215.8
-expected_eps_query_bits = 128.3
-expected_eps_ood_bits = 237.4
-expected_eps_claim_batch_bits = 122.4
-expected_eps_sumcheck_bits = 249.4
-expected_eps_consistency_batch_bits = 119.4
+expected_eps_query_bits = 112.2
+expected_eps_ood_bits = 236.4
+expected_eps_claim_batch_bits = 121.9
+expected_eps_sumcheck_bits = 248.9
+expected_eps_consistency_batch_bits = 119.0
 
 [[levels]]
-log_inv_rate = 3
+log_inv_rate = 5
 log_msg_cols = 11
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 91
-grinding_bits = 0
+queries = 48
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
+claim_batch_grinding_bits = 8
+consistency_batch_grinding_bits = 10
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 218.8
-expected_eps_query_bits = 129.3
-expected_eps_ood_bits = 236.9
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
+expected_eps_pg_bits = 217.8
+expected_eps_query_bits = 112.6
+expected_eps_ood_bits = 234.9
+expected_eps_claim_batch_bits = 120.9
+expected_eps_sumcheck_bits = 247.9
+expected_eps_consistency_batch_bits = 118.3
 
 [[levels]]
-log_inv_rate = 4
+log_inv_rate = 7
 log_msg_cols = 8
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 68
-grinding_bits = 0
+queries = 35
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 221.1
-expected_eps_query_bits = 128.4
-expected_eps_ood_bits = 236.5
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.5
+expected_eps_pg_bits = 219.0
+expected_eps_query_bits = 112.2
+expected_eps_ood_bits = 233.5
+expected_eps_claim_batch_bits = 119.9
+expected_eps_sumcheck_bits = 246.9
+expected_eps_consistency_batch_bits = 117.3
 
 [[levels]]
-log_inv_rate = 5
+log_inv_rate = 9
 log_msg_cols = 5
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 55
-grinding_bits = 0
+queries = 29
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 10
+consistency_batch_grinding_bits = 12
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 223.8
-expected_eps_query_bits = 129.0
-expected_eps_ood_bits = 236.4
-expected_eps_claim_batch_bits = 120.9
-expected_eps_sumcheck_bits = 247.9
-expected_eps_consistency_batch_bits = 118.3
+expected_eps_pg_bits = 217.0
+expected_eps_query_bits = 114.9
+expected_eps_ood_bits = 232.4
+expected_eps_claim_batch_bits = 118.9
+expected_eps_sumcheck_bits = 245.9
+expected_eps_consistency_batch_bits = 116.5
 
 [final_block]
 yr_log_n = 5
diff --git a/crates/flock-core/configs/ligerito/m28_fast128.toml b/crates/flock-core/configs/ligerito/m28_fast128.toml
deleted file mode 100644
index 2ad0b64f..00000000
--- a/crates/flock-core/configs/ligerito/m28_fast128.toml
+++ /dev/null
@@ -1,116 +0,0 @@
-m = 28
-log_n = 21
-initial_k = 4
-target_security_bits = 100
-analysis_version = "f256_split_johnson_two_point_ood_query128_c3_algebraic_row_union_over_bchks25_thm_4_6"
-field = "f256"
-hash = "sha256"
-grinding_step = "post_commit_pre_queries"
-
-[[levels]]
-log_inv_rate = 1
-log_msg_cols = 17
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 244
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
-consistency_batch_grinding_bits = 9
-ood_samples = 1
-target_security_bits = 100
-expected_eps_pg_bits = 213.0
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 237.5
-expected_eps_claim_batch_bits = 122.9
-expected_eps_sumcheck_bits = 249.9
-expected_eps_consistency_batch_bits = 119.9
-
-[[levels]]
-log_inv_rate = 3
-log_msg_cols = 14
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 79
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 215.8
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 236.4
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
-
-[[levels]]
-log_inv_rate = 5
-log_msg_cols = 11
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 48
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 10
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 217.8
-expected_eps_query_bits = 112.6
-expected_eps_ood_bits = 234.9
-expected_eps_claim_batch_bits = 120.9
-expected_eps_sumcheck_bits = 247.9
-expected_eps_consistency_batch_bits = 118.3
-
-[[levels]]
-log_inv_rate = 7
-log_msg_cols = 8
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 35
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 9
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 219.0
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 233.5
-expected_eps_claim_batch_bits = 119.9
-expected_eps_sumcheck_bits = 246.9
-expected_eps_consistency_batch_bits = 117.3
-
-[[levels]]
-log_inv_rate = 9
-log_msg_cols = 5
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 29
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 10
-consistency_batch_grinding_bits = 12
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 217.0
-expected_eps_query_bits = 114.9
-expected_eps_ood_bits = 232.4
-expected_eps_claim_batch_bits = 118.9
-expected_eps_sumcheck_bits = 245.9
-expected_eps_consistency_batch_bits = 116.5
-
-[final_block]
-yr_log_n = 5
diff --git a/crates/flock-core/configs/ligerito/m28_slim.toml b/crates/flock-core/configs/ligerito/m28_slim.toml
index 2f6ec016..d137fc72 100644
--- a/crates/flock-core/configs/ligerito/m28_slim.toml
+++ b/crates/flock-core/configs/ligerito/m28_slim.toml
@@ -29,88 +29,88 @@ expected_eps_sumcheck_bits = 249.4
 expected_eps_consistency_batch_bits = 119.5
 
 [[levels]]
-log_inv_rate = 3
+log_inv_rate = 4
 log_msg_cols = 14
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 79
+queries = 60
 grinding_bits = 16
 fold_grinding_bits = 0
 claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 10
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 215.8
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 236.4
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
+expected_eps_pg_bits = 215.1
+expected_eps_query_bits = 113.3
+expected_eps_ood_bits = 235.4
+expected_eps_claim_batch_bits = 121.4
+expected_eps_sumcheck_bits = 248.4
+expected_eps_consistency_batch_bits = 118.8
 
 [[levels]]
-log_inv_rate = 4
+log_inv_rate = 6
 log_msg_cols = 11
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 60
+queries = 41
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 8
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 218.1
-expected_eps_query_bits = 113.3
-expected_eps_ood_bits = 235.9
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.8
+expected_eps_pg_bits = 216.7
+expected_eps_query_bits = 114.2
+expected_eps_ood_bits = 233.9
+expected_eps_claim_batch_bits = 120.4
+expected_eps_sumcheck_bits = 247.4
+expected_eps_consistency_batch_bits = 117.8
 
 [[levels]]
-log_inv_rate = 5
+log_inv_rate = 8
 log_msg_cols = 8
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 48
+queries = 32
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 220.8
-expected_eps_query_bits = 112.6
-expected_eps_ood_bits = 235.5
-expected_eps_claim_batch_bits = 120.9
-expected_eps_sumcheck_bits = 247.9
-expected_eps_consistency_batch_bits = 118.3
+expected_eps_pg_bits = 216.5
+expected_eps_query_bits = 115.2
+expected_eps_ood_bits = 232.5
+expected_eps_claim_batch_bits = 119.4
+expected_eps_sumcheck_bits = 246.4
+expected_eps_consistency_batch_bits = 117.0
 
 [[levels]]
-log_inv_rate = 6
+log_inv_rate = 10
 log_msg_cols = 5
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 41
+queries = 27
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 11
+claim_batch_grinding_bits = 10
+consistency_batch_grinding_bits = 12
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 222.7
-expected_eps_query_bits = 114.2
-expected_eps_ood_bits = 235.4
-expected_eps_claim_batch_bits = 120.4
-expected_eps_sumcheck_bits = 247.4
-expected_eps_consistency_batch_bits = 117.8
+expected_eps_pg_bits = 214.5
+expected_eps_query_bits = 115.7
+expected_eps_ood_bits = 231.4
+expected_eps_claim_batch_bits = 118.4
+expected_eps_sumcheck_bits = 245.4
+expected_eps_consistency_batch_bits = 116.0
 
 [final_block]
 yr_log_n = 5
diff --git a/crates/flock-core/configs/ligerito/m28_slim128.toml b/crates/flock-core/configs/ligerito/m28_slim128.toml
deleted file mode 100644
index d137fc72..00000000
--- a/crates/flock-core/configs/ligerito/m28_slim128.toml
+++ /dev/null
@@ -1,116 +0,0 @@
-m = 28
-log_n = 21
-initial_k = 4
-target_security_bits = 100
-analysis_version = "f256_split_johnson_two_point_ood_query128_c3_algebraic_row_union_over_bchks25_thm_4_6"
-field = "f256"
-hash = "sha256"
-grinding_step = "post_commit_pre_queries"
-
-[[levels]]
-log_inv_rate = 2
-log_msg_cols = 17
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 119
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
-consistency_batch_grinding_bits = 9
-ood_samples = 1
-target_security_bits = 100
-expected_eps_pg_bits = 212.8
-expected_eps_query_bits = 112.3
-expected_eps_ood_bits = 236.5
-expected_eps_claim_batch_bits = 122.4
-expected_eps_sumcheck_bits = 249.4
-expected_eps_consistency_batch_bits = 119.5
-
-[[levels]]
-log_inv_rate = 4
-log_msg_cols = 14
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 60
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 215.1
-expected_eps_query_bits = 113.3
-expected_eps_ood_bits = 235.4
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.8
-
-[[levels]]
-log_inv_rate = 6
-log_msg_cols = 11
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 41
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 216.7
-expected_eps_query_bits = 114.2
-expected_eps_ood_bits = 233.9
-expected_eps_claim_batch_bits = 120.4
-expected_eps_sumcheck_bits = 247.4
-expected_eps_consistency_batch_bits = 117.8
-
-[[levels]]
-log_inv_rate = 8
-log_msg_cols = 8
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 32
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 9
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 216.5
-expected_eps_query_bits = 115.2
-expected_eps_ood_bits = 232.5
-expected_eps_claim_batch_bits = 119.4
-expected_eps_sumcheck_bits = 246.4
-expected_eps_consistency_batch_bits = 117.0
-
-[[levels]]
-log_inv_rate = 10
-log_msg_cols = 5
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 27
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 10
-consistency_batch_grinding_bits = 12
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 214.5
-expected_eps_query_bits = 115.7
-expected_eps_ood_bits = 231.4
-expected_eps_claim_batch_bits = 118.4
-expected_eps_sumcheck_bits = 245.4
-expected_eps_consistency_batch_bits = 116.0
-
-[final_block]
-yr_log_n = 5
diff --git a/crates/flock-core/configs/ligerito/m29_fast.toml b/crates/flock-core/configs/ligerito/m29_fast.toml
index c2f2b667..df6a4a9f 100644
--- a/crates/flock-core/configs/ligerito/m29_fast.toml
+++ b/crates/flock-core/configs/ligerito/m29_fast.toml
@@ -14,103 +14,103 @@ log_num_interleaved = 5
 k_recursive = 5
 regime = "johnson_ood"
 eta = 0.02
-queries = 279
-grinding_bits = 0
+queries = 244
+grinding_bits = 16
 fold_grinding_bits = 0
 claim_batch_grinding_bits = 6
 consistency_batch_grinding_bits = 9
 ood_samples = 1
 target_security_bits = 100
 expected_eps_pg_bits = 212.0
-expected_eps_query_bits = 128.3
+expected_eps_query_bits = 112.2
 expected_eps_ood_bits = 237.4
 expected_eps_claim_batch_bits = 122.9
 expected_eps_sumcheck_bits = 249.9
-expected_eps_consistency_batch_bits = 119.7
+expected_eps_consistency_batch_bits = 119.9
 
 [[levels]]
-log_inv_rate = 2
+log_inv_rate = 3
 log_msg_cols = 14
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 136
-grinding_bits = 0
+queries = 79
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
+claim_batch_grinding_bits = 7
 consistency_batch_grinding_bits = 9
 ood_samples = 2
 target_security_bits = 100
 expected_eps_pg_bits = 215.8
-expected_eps_query_bits = 128.3
-expected_eps_ood_bits = 237.4
-expected_eps_claim_batch_bits = 122.4
-expected_eps_sumcheck_bits = 249.4
-expected_eps_consistency_batch_bits = 119.4
+expected_eps_query_bits = 112.2
+expected_eps_ood_bits = 236.4
+expected_eps_claim_batch_bits = 121.9
+expected_eps_sumcheck_bits = 248.9
+expected_eps_consistency_batch_bits = 119.0
 
 [[levels]]
-log_inv_rate = 3
+log_inv_rate = 5
 log_msg_cols = 11
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 91
-grinding_bits = 0
+queries = 48
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
+claim_batch_grinding_bits = 8
+consistency_batch_grinding_bits = 10
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 218.8
-expected_eps_query_bits = 129.3
-expected_eps_ood_bits = 236.9
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
+expected_eps_pg_bits = 217.8
+expected_eps_query_bits = 112.6
+expected_eps_ood_bits = 234.9
+expected_eps_claim_batch_bits = 120.9
+expected_eps_sumcheck_bits = 247.9
+expected_eps_consistency_batch_bits = 118.3
 
 [[levels]]
-log_inv_rate = 4
+log_inv_rate = 7
 log_msg_cols = 8
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 68
-grinding_bits = 0
+queries = 35
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 221.1
-expected_eps_query_bits = 128.4
-expected_eps_ood_bits = 236.5
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.5
+expected_eps_pg_bits = 219.0
+expected_eps_query_bits = 112.2
+expected_eps_ood_bits = 233.5
+expected_eps_claim_batch_bits = 119.9
+expected_eps_sumcheck_bits = 246.9
+expected_eps_consistency_batch_bits = 117.3
 
 [[levels]]
-log_inv_rate = 5
+log_inv_rate = 9
 log_msg_cols = 5
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 55
-grinding_bits = 0
+queries = 29
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 10
+consistency_batch_grinding_bits = 12
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 223.8
-expected_eps_query_bits = 129.0
-expected_eps_ood_bits = 236.4
-expected_eps_claim_batch_bits = 120.9
-expected_eps_sumcheck_bits = 247.9
-expected_eps_consistency_batch_bits = 118.3
+expected_eps_pg_bits = 217.0
+expected_eps_query_bits = 114.9
+expected_eps_ood_bits = 232.4
+expected_eps_claim_batch_bits = 118.9
+expected_eps_sumcheck_bits = 245.9
+expected_eps_consistency_batch_bits = 116.5
 
 [final_block]
 yr_log_n = 5
diff --git a/crates/flock-core/configs/ligerito/m29_fast128.toml b/crates/flock-core/configs/ligerito/m29_fast128.toml
deleted file mode 100644
index df6a4a9f..00000000
--- a/crates/flock-core/configs/ligerito/m29_fast128.toml
+++ /dev/null
@@ -1,116 +0,0 @@
-m = 29
-log_n = 22
-initial_k = 5
-target_security_bits = 100
-analysis_version = "f256_split_johnson_two_point_ood_query128_c3_algebraic_row_union_over_bchks25_thm_4_6"
-field = "f256"
-hash = "sha256"
-grinding_step = "post_commit_pre_queries"
-
-[[levels]]
-log_inv_rate = 1
-log_msg_cols = 17
-log_num_interleaved = 5
-k_recursive = 5
-regime = "johnson_ood"
-eta = 0.02
-queries = 244
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
-consistency_batch_grinding_bits = 9
-ood_samples = 1
-target_security_bits = 100
-expected_eps_pg_bits = 212.0
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 237.4
-expected_eps_claim_batch_bits = 122.9
-expected_eps_sumcheck_bits = 249.9
-expected_eps_consistency_batch_bits = 119.9
-
-[[levels]]
-log_inv_rate = 3
-log_msg_cols = 14
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 79
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 215.8
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 236.4
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
-
-[[levels]]
-log_inv_rate = 5
-log_msg_cols = 11
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 48
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 10
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 217.8
-expected_eps_query_bits = 112.6
-expected_eps_ood_bits = 234.9
-expected_eps_claim_batch_bits = 120.9
-expected_eps_sumcheck_bits = 247.9
-expected_eps_consistency_batch_bits = 118.3
-
-[[levels]]
-log_inv_rate = 7
-log_msg_cols = 8
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 35
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 9
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 219.0
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 233.5
-expected_eps_claim_batch_bits = 119.9
-expected_eps_sumcheck_bits = 246.9
-expected_eps_consistency_batch_bits = 117.3
-
-[[levels]]
-log_inv_rate = 9
-log_msg_cols = 5
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 29
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 10
-consistency_batch_grinding_bits = 12
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 217.0
-expected_eps_query_bits = 114.9
-expected_eps_ood_bits = 232.4
-expected_eps_claim_batch_bits = 118.9
-expected_eps_sumcheck_bits = 245.9
-expected_eps_consistency_batch_bits = 116.5
-
-[final_block]
-yr_log_n = 5
diff --git a/crates/flock-core/configs/ligerito/m29_slim.toml b/crates/flock-core/configs/ligerito/m29_slim.toml
index e7d90a4d..64e1f996 100644
--- a/crates/flock-core/configs/ligerito/m29_slim.toml
+++ b/crates/flock-core/configs/ligerito/m29_slim.toml
@@ -29,88 +29,88 @@ expected_eps_sumcheck_bits = 249.4
 expected_eps_consistency_batch_bits = 119.5
 
 [[levels]]
-log_inv_rate = 3
+log_inv_rate = 4
 log_msg_cols = 14
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 79
+queries = 60
 grinding_bits = 16
 fold_grinding_bits = 0
 claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 10
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 215.8
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 236.4
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
+expected_eps_pg_bits = 215.1
+expected_eps_query_bits = 113.3
+expected_eps_ood_bits = 235.4
+expected_eps_claim_batch_bits = 121.4
+expected_eps_sumcheck_bits = 248.4
+expected_eps_consistency_batch_bits = 118.8
 
 [[levels]]
-log_inv_rate = 4
+log_inv_rate = 6
 log_msg_cols = 11
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 60
+queries = 41
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 8
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 218.1
-expected_eps_query_bits = 113.3
-expected_eps_ood_bits = 235.9
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.8
+expected_eps_pg_bits = 216.7
+expected_eps_query_bits = 114.2
+expected_eps_ood_bits = 233.9
+expected_eps_claim_batch_bits = 120.4
+expected_eps_sumcheck_bits = 247.4
+expected_eps_consistency_batch_bits = 117.8
 
 [[levels]]
-log_inv_rate = 5
+log_inv_rate = 8
 log_msg_cols = 8
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 48
+queries = 32
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 220.8
-expected_eps_query_bits = 112.6
-expected_eps_ood_bits = 235.5
-expected_eps_claim_batch_bits = 120.9
-expected_eps_sumcheck_bits = 247.9
-expected_eps_consistency_batch_bits = 118.3
+expected_eps_pg_bits = 216.5
+expected_eps_query_bits = 115.2
+expected_eps_ood_bits = 232.5
+expected_eps_claim_batch_bits = 119.4
+expected_eps_sumcheck_bits = 246.4
+expected_eps_consistency_batch_bits = 117.0
 
 [[levels]]
-log_inv_rate = 6
+log_inv_rate = 10
 log_msg_cols = 5
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 41
+queries = 27
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 11
+claim_batch_grinding_bits = 10
+consistency_batch_grinding_bits = 12
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 222.7
-expected_eps_query_bits = 114.2
-expected_eps_ood_bits = 235.4
-expected_eps_claim_batch_bits = 120.4
-expected_eps_sumcheck_bits = 247.4
-expected_eps_consistency_batch_bits = 117.8
+expected_eps_pg_bits = 214.5
+expected_eps_query_bits = 115.7
+expected_eps_ood_bits = 231.4
+expected_eps_claim_batch_bits = 118.4
+expected_eps_sumcheck_bits = 245.4
+expected_eps_consistency_batch_bits = 116.0
 
 [final_block]
 yr_log_n = 5
diff --git a/crates/flock-core/configs/ligerito/m29_slim128.toml b/crates/flock-core/configs/ligerito/m29_slim128.toml
deleted file mode 100644
index 64e1f996..00000000
--- a/crates/flock-core/configs/ligerito/m29_slim128.toml
+++ /dev/null
@@ -1,116 +0,0 @@
-m = 29
-log_n = 22
-initial_k = 5
-target_security_bits = 100
-analysis_version = "f256_split_johnson_two_point_ood_query128_c3_algebraic_row_union_over_bchks25_thm_4_6"
-field = "f256"
-hash = "sha256"
-grinding_step = "post_commit_pre_queries"
-
-[[levels]]
-log_inv_rate = 2
-log_msg_cols = 17
-log_num_interleaved = 5
-k_recursive = 5
-regime = "johnson_ood"
-eta = 0.02
-queries = 119
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
-consistency_batch_grinding_bits = 9
-ood_samples = 1
-target_security_bits = 100
-expected_eps_pg_bits = 211.8
-expected_eps_query_bits = 112.3
-expected_eps_ood_bits = 236.4
-expected_eps_claim_batch_bits = 122.4
-expected_eps_sumcheck_bits = 249.4
-expected_eps_consistency_batch_bits = 119.5
-
-[[levels]]
-log_inv_rate = 4
-log_msg_cols = 14
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 60
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 215.1
-expected_eps_query_bits = 113.3
-expected_eps_ood_bits = 235.4
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.8
-
-[[levels]]
-log_inv_rate = 6
-log_msg_cols = 11
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 41
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 216.7
-expected_eps_query_bits = 114.2
-expected_eps_ood_bits = 233.9
-expected_eps_claim_batch_bits = 120.4
-expected_eps_sumcheck_bits = 247.4
-expected_eps_consistency_batch_bits = 117.8
-
-[[levels]]
-log_inv_rate = 8
-log_msg_cols = 8
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 32
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 9
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 216.5
-expected_eps_query_bits = 115.2
-expected_eps_ood_bits = 232.5
-expected_eps_claim_batch_bits = 119.4
-expected_eps_sumcheck_bits = 246.4
-expected_eps_consistency_batch_bits = 117.0
-
-[[levels]]
-log_inv_rate = 10
-log_msg_cols = 5
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 27
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 10
-consistency_batch_grinding_bits = 12
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 214.5
-expected_eps_query_bits = 115.7
-expected_eps_ood_bits = 231.4
-expected_eps_claim_batch_bits = 118.4
-expected_eps_sumcheck_bits = 245.4
-expected_eps_consistency_batch_bits = 116.0
-
-[final_block]
-yr_log_n = 5
diff --git a/crates/flock-core/configs/ligerito/m30_fast.toml b/crates/flock-core/configs/ligerito/m30_fast.toml
index 7bdfff0d..9b27b177 100644
--- a/crates/flock-core/configs/ligerito/m30_fast.toml
+++ b/crates/flock-core/configs/ligerito/m30_fast.toml
@@ -14,103 +14,103 @@ log_num_interleaved = 6
 k_recursive = 6
 regime = "johnson_ood"
 eta = 0.02
-queries = 279
-grinding_bits = 0
+queries = 244
+grinding_bits = 16
 fold_grinding_bits = 0
 claim_batch_grinding_bits = 6
 consistency_batch_grinding_bits = 9
 ood_samples = 1
 target_security_bits = 100
 expected_eps_pg_bits = 211.0
-expected_eps_query_bits = 128.3
+expected_eps_query_bits = 112.2
 expected_eps_ood_bits = 237.3
 expected_eps_claim_batch_bits = 122.9
 expected_eps_sumcheck_bits = 249.9
-expected_eps_consistency_batch_bits = 119.7
+expected_eps_consistency_batch_bits = 119.9
 
 [[levels]]
-log_inv_rate = 2
+log_inv_rate = 3
 log_msg_cols = 14
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 136
-grinding_bits = 0
+queries = 79
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
+claim_batch_grinding_bits = 7
 consistency_batch_grinding_bits = 9
 ood_samples = 2
 target_security_bits = 100
 expected_eps_pg_bits = 215.8
-expected_eps_query_bits = 128.3
-expected_eps_ood_bits = 237.4
-expected_eps_claim_batch_bits = 122.4
-expected_eps_sumcheck_bits = 249.4
-expected_eps_consistency_batch_bits = 119.4
+expected_eps_query_bits = 112.2
+expected_eps_ood_bits = 236.4
+expected_eps_claim_batch_bits = 121.9
+expected_eps_sumcheck_bits = 248.9
+expected_eps_consistency_batch_bits = 119.0
 
 [[levels]]
-log_inv_rate = 3
+log_inv_rate = 5
 log_msg_cols = 11
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 91
-grinding_bits = 0
+queries = 48
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
+claim_batch_grinding_bits = 8
+consistency_batch_grinding_bits = 10
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 218.8
-expected_eps_query_bits = 129.3
-expected_eps_ood_bits = 236.9
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
+expected_eps_pg_bits = 217.8
+expected_eps_query_bits = 112.6
+expected_eps_ood_bits = 234.9
+expected_eps_claim_batch_bits = 120.9
+expected_eps_sumcheck_bits = 247.9
+expected_eps_consistency_batch_bits = 118.3
 
 [[levels]]
-log_inv_rate = 4
+log_inv_rate = 7
 log_msg_cols = 8
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 68
-grinding_bits = 0
+queries = 35
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 221.1
-expected_eps_query_bits = 128.4
-expected_eps_ood_bits = 236.5
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.5
+expected_eps_pg_bits = 219.0
+expected_eps_query_bits = 112.2
+expected_eps_ood_bits = 233.5
+expected_eps_claim_batch_bits = 119.9
+expected_eps_sumcheck_bits = 246.9
+expected_eps_consistency_batch_bits = 117.3
 
 [[levels]]
-log_inv_rate = 5
+log_inv_rate = 9
 log_msg_cols = 5
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 55
-grinding_bits = 0
+queries = 29
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 10
+consistency_batch_grinding_bits = 12
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 223.8
-expected_eps_query_bits = 129.0
-expected_eps_ood_bits = 236.4
-expected_eps_claim_batch_bits = 120.9
-expected_eps_sumcheck_bits = 247.9
-expected_eps_consistency_batch_bits = 118.3
+expected_eps_pg_bits = 217.0
+expected_eps_query_bits = 114.9
+expected_eps_ood_bits = 232.4
+expected_eps_claim_batch_bits = 118.9
+expected_eps_sumcheck_bits = 245.9
+expected_eps_consistency_batch_bits = 116.5
 
 [final_block]
 yr_log_n = 5
diff --git a/crates/flock-core/configs/ligerito/m30_fast128.toml b/crates/flock-core/configs/ligerito/m30_fast128.toml
deleted file mode 100644
index 9b27b177..00000000
--- a/crates/flock-core/configs/ligerito/m30_fast128.toml
+++ /dev/null
@@ -1,116 +0,0 @@
-m = 30
-log_n = 23
-initial_k = 6
-target_security_bits = 100
-analysis_version = "f256_split_johnson_two_point_ood_query128_c3_algebraic_row_union_over_bchks25_thm_4_6"
-field = "f256"
-hash = "sha256"
-grinding_step = "post_commit_pre_queries"
-
-[[levels]]
-log_inv_rate = 1
-log_msg_cols = 17
-log_num_interleaved = 6
-k_recursive = 6
-regime = "johnson_ood"
-eta = 0.02
-queries = 244
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
-consistency_batch_grinding_bits = 9
-ood_samples = 1
-target_security_bits = 100
-expected_eps_pg_bits = 211.0
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 237.3
-expected_eps_claim_batch_bits = 122.9
-expected_eps_sumcheck_bits = 249.9
-expected_eps_consistency_batch_bits = 119.9
-
-[[levels]]
-log_inv_rate = 3
-log_msg_cols = 14
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 79
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 215.8
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 236.4
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
-
-[[levels]]
-log_inv_rate = 5
-log_msg_cols = 11
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 48
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 10
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 217.8
-expected_eps_query_bits = 112.6
-expected_eps_ood_bits = 234.9
-expected_eps_claim_batch_bits = 120.9
-expected_eps_sumcheck_bits = 247.9
-expected_eps_consistency_batch_bits = 118.3
-
-[[levels]]
-log_inv_rate = 7
-log_msg_cols = 8
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 35
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 9
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 219.0
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 233.5
-expected_eps_claim_batch_bits = 119.9
-expected_eps_sumcheck_bits = 246.9
-expected_eps_consistency_batch_bits = 117.3
-
-[[levels]]
-log_inv_rate = 9
-log_msg_cols = 5
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 29
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 10
-consistency_batch_grinding_bits = 12
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 217.0
-expected_eps_query_bits = 114.9
-expected_eps_ood_bits = 232.4
-expected_eps_claim_batch_bits = 118.9
-expected_eps_sumcheck_bits = 245.9
-expected_eps_consistency_batch_bits = 116.5
-
-[final_block]
-yr_log_n = 5
diff --git a/crates/flock-core/configs/ligerito/m30_slim.toml b/crates/flock-core/configs/ligerito/m30_slim.toml
index e7ec732d..ae32b175 100644
--- a/crates/flock-core/configs/ligerito/m30_slim.toml
+++ b/crates/flock-core/configs/ligerito/m30_slim.toml
@@ -29,88 +29,88 @@ expected_eps_sumcheck_bits = 249.4
 expected_eps_consistency_batch_bits = 119.5
 
 [[levels]]
-log_inv_rate = 3
+log_inv_rate = 4
 log_msg_cols = 14
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 79
+queries = 60
 grinding_bits = 16
 fold_grinding_bits = 0
 claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 10
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 215.8
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 236.4
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
+expected_eps_pg_bits = 215.1
+expected_eps_query_bits = 113.3
+expected_eps_ood_bits = 235.4
+expected_eps_claim_batch_bits = 121.4
+expected_eps_sumcheck_bits = 248.4
+expected_eps_consistency_batch_bits = 118.8
 
 [[levels]]
-log_inv_rate = 4
+log_inv_rate = 6
 log_msg_cols = 11
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 60
+queries = 41
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 8
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 218.1
-expected_eps_query_bits = 113.3
-expected_eps_ood_bits = 235.9
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.8
+expected_eps_pg_bits = 216.7
+expected_eps_query_bits = 114.2
+expected_eps_ood_bits = 233.9
+expected_eps_claim_batch_bits = 120.4
+expected_eps_sumcheck_bits = 247.4
+expected_eps_consistency_batch_bits = 117.8
 
 [[levels]]
-log_inv_rate = 5
+log_inv_rate = 8
 log_msg_cols = 8
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 48
+queries = 32
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 220.8
-expected_eps_query_bits = 112.6
-expected_eps_ood_bits = 235.5
-expected_eps_claim_batch_bits = 120.9
-expected_eps_sumcheck_bits = 247.9
-expected_eps_consistency_batch_bits = 118.3
+expected_eps_pg_bits = 216.5
+expected_eps_query_bits = 115.2
+expected_eps_ood_bits = 232.5
+expected_eps_claim_batch_bits = 119.4
+expected_eps_sumcheck_bits = 246.4
+expected_eps_consistency_batch_bits = 117.0
 
 [[levels]]
-log_inv_rate = 6
+log_inv_rate = 10
 log_msg_cols = 5
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 41
+queries = 27
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 11
+claim_batch_grinding_bits = 10
+consistency_batch_grinding_bits = 12
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 222.7
-expected_eps_query_bits = 114.2
-expected_eps_ood_bits = 235.4
-expected_eps_claim_batch_bits = 120.4
-expected_eps_sumcheck_bits = 247.4
-expected_eps_consistency_batch_bits = 117.8
+expected_eps_pg_bits = 214.5
+expected_eps_query_bits = 115.7
+expected_eps_ood_bits = 231.4
+expected_eps_claim_batch_bits = 118.4
+expected_eps_sumcheck_bits = 245.4
+expected_eps_consistency_batch_bits = 116.0
 
 [final_block]
 yr_log_n = 5
diff --git a/crates/flock-core/configs/ligerito/m30_slim128.toml b/crates/flock-core/configs/ligerito/m30_slim128.toml
deleted file mode 100644
index ae32b175..00000000
--- a/crates/flock-core/configs/ligerito/m30_slim128.toml
+++ /dev/null
@@ -1,116 +0,0 @@
-m = 30
-log_n = 23
-initial_k = 6
-target_security_bits = 100
-analysis_version = "f256_split_johnson_two_point_ood_query128_c3_algebraic_row_union_over_bchks25_thm_4_6"
-field = "f256"
-hash = "sha256"
-grinding_step = "post_commit_pre_queries"
-
-[[levels]]
-log_inv_rate = 2
-log_msg_cols = 17
-log_num_interleaved = 6
-k_recursive = 6
-regime = "johnson_ood"
-eta = 0.02
-queries = 119
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
-consistency_batch_grinding_bits = 9
-ood_samples = 1
-target_security_bits = 100
-expected_eps_pg_bits = 210.8
-expected_eps_query_bits = 112.3
-expected_eps_ood_bits = 236.3
-expected_eps_claim_batch_bits = 122.4
-expected_eps_sumcheck_bits = 249.4
-expected_eps_consistency_batch_bits = 119.5
-
-[[levels]]
-log_inv_rate = 4
-log_msg_cols = 14
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 60
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 215.1
-expected_eps_query_bits = 113.3
-expected_eps_ood_bits = 235.4
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.8
-
-[[levels]]
-log_inv_rate = 6
-log_msg_cols = 11
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 41
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 216.7
-expected_eps_query_bits = 114.2
-expected_eps_ood_bits = 233.9
-expected_eps_claim_batch_bits = 120.4
-expected_eps_sumcheck_bits = 247.4
-expected_eps_consistency_batch_bits = 117.8
-
-[[levels]]
-log_inv_rate = 8
-log_msg_cols = 8
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 32
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 9
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 216.5
-expected_eps_query_bits = 115.2
-expected_eps_ood_bits = 232.5
-expected_eps_claim_batch_bits = 119.4
-expected_eps_sumcheck_bits = 246.4
-expected_eps_consistency_batch_bits = 117.0
-
-[[levels]]
-log_inv_rate = 10
-log_msg_cols = 5
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 27
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 10
-consistency_batch_grinding_bits = 12
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 214.5
-expected_eps_query_bits = 115.7
-expected_eps_ood_bits = 231.4
-expected_eps_claim_batch_bits = 118.4
-expected_eps_sumcheck_bits = 245.4
-expected_eps_consistency_batch_bits = 116.0
-
-[final_block]
-yr_log_n = 5
diff --git a/crates/flock-core/configs/ligerito/m31_fast.toml b/crates/flock-core/configs/ligerito/m31_fast.toml
index d81766f0..34641639 100644
--- a/crates/flock-core/configs/ligerito/m31_fast.toml
+++ b/crates/flock-core/configs/ligerito/m31_fast.toml
@@ -14,124 +14,124 @@ log_num_interleaved = 6
 k_recursive = 6
 regime = "johnson_ood"
 eta = 0.02
-queries = 279
-grinding_bits = 0
+queries = 244
+grinding_bits = 16
 fold_grinding_bits = 0
 claim_batch_grinding_bits = 6
 consistency_batch_grinding_bits = 9
 ood_samples = 1
 target_security_bits = 100
 expected_eps_pg_bits = 210.0
-expected_eps_query_bits = 128.3
+expected_eps_query_bits = 112.2
 expected_eps_ood_bits = 237.2
 expected_eps_claim_batch_bits = 122.9
 expected_eps_sumcheck_bits = 249.9
-expected_eps_consistency_batch_bits = 119.7
+expected_eps_consistency_batch_bits = 119.9
 
 [[levels]]
-log_inv_rate = 2
+log_inv_rate = 3
 log_msg_cols = 15
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 136
-grinding_bits = 0
+queries = 79
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
+claim_batch_grinding_bits = 7
 consistency_batch_grinding_bits = 9
 ood_samples = 2
 target_security_bits = 100
 expected_eps_pg_bits = 214.8
-expected_eps_query_bits = 128.3
-expected_eps_ood_bits = 237.2
-expected_eps_claim_batch_bits = 122.4
-expected_eps_sumcheck_bits = 249.4
-expected_eps_consistency_batch_bits = 119.4
+expected_eps_query_bits = 112.2
+expected_eps_ood_bits = 236.2
+expected_eps_claim_batch_bits = 121.9
+expected_eps_sumcheck_bits = 248.9
+expected_eps_consistency_batch_bits = 119.0
 
 [[levels]]
-log_inv_rate = 3
+log_inv_rate = 5
 log_msg_cols = 12
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 91
-grinding_bits = 0
+queries = 48
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
+claim_batch_grinding_bits = 8
+consistency_batch_grinding_bits = 10
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 217.8
-expected_eps_query_bits = 129.3
-expected_eps_ood_bits = 236.7
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
+expected_eps_pg_bits = 216.8
+expected_eps_query_bits = 112.6
+expected_eps_ood_bits = 234.7
+expected_eps_claim_batch_bits = 120.9
+expected_eps_sumcheck_bits = 247.9
+expected_eps_consistency_batch_bits = 118.3
 
 [[levels]]
-log_inv_rate = 4
+log_inv_rate = 7
 log_msg_cols = 9
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 68
-grinding_bits = 0
+queries = 35
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 220.1
-expected_eps_query_bits = 128.4
-expected_eps_ood_bits = 236.3
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.5
+expected_eps_pg_bits = 218.0
+expected_eps_query_bits = 112.2
+expected_eps_ood_bits = 233.3
+expected_eps_claim_batch_bits = 119.9
+expected_eps_sumcheck_bits = 246.9
+expected_eps_consistency_batch_bits = 117.3
 
 [[levels]]
-log_inv_rate = 5
+log_inv_rate = 9
 log_msg_cols = 6
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 55
-grinding_bits = 0
+queries = 29
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 10
+consistency_batch_grinding_bits = 12
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 222.8
-expected_eps_query_bits = 129.0
-expected_eps_ood_bits = 236.1
-expected_eps_claim_batch_bits = 120.9
-expected_eps_sumcheck_bits = 247.9
-expected_eps_consistency_batch_bits = 118.3
+expected_eps_pg_bits = 216.0
+expected_eps_query_bits = 114.9
+expected_eps_ood_bits = 232.1
+expected_eps_claim_batch_bits = 118.9
+expected_eps_sumcheck_bits = 245.9
+expected_eps_consistency_batch_bits = 116.5
 
 [[levels]]
-log_inv_rate = 6
+log_inv_rate = 11
 log_msg_cols = 3
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 46
-grinding_bits = 0
+queries = 25
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 11
+claim_batch_grinding_bits = 11
+consistency_batch_grinding_bits = 13
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 224.7
-expected_eps_query_bits = 128.2
-expected_eps_ood_bits = 236.1
-expected_eps_claim_batch_bits = 120.4
-expected_eps_sumcheck_bits = 247.4
-expected_eps_consistency_batch_bits = 117.8
+expected_eps_pg_bits = 214.0
+expected_eps_query_bits = 114.3
+expected_eps_ood_bits = 231.1
+expected_eps_claim_batch_bits = 117.9
+expected_eps_sumcheck_bits = 244.9
+expected_eps_consistency_batch_bits = 115.5
 
 [final_block]
 yr_log_n = 3
diff --git a/crates/flock-core/configs/ligerito/m31_fast128.toml b/crates/flock-core/configs/ligerito/m31_fast128.toml
deleted file mode 100644
index 34641639..00000000
--- a/crates/flock-core/configs/ligerito/m31_fast128.toml
+++ /dev/null
@@ -1,137 +0,0 @@
-m = 31
-log_n = 24
-initial_k = 6
-target_security_bits = 100
-analysis_version = "f256_split_johnson_two_point_ood_query128_c3_algebraic_row_union_over_bchks25_thm_4_6"
-field = "f256"
-hash = "sha256"
-grinding_step = "post_commit_pre_queries"
-
-[[levels]]
-log_inv_rate = 1
-log_msg_cols = 18
-log_num_interleaved = 6
-k_recursive = 6
-regime = "johnson_ood"
-eta = 0.02
-queries = 244
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
-consistency_batch_grinding_bits = 9
-ood_samples = 1
-target_security_bits = 100
-expected_eps_pg_bits = 210.0
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 237.2
-expected_eps_claim_batch_bits = 122.9
-expected_eps_sumcheck_bits = 249.9
-expected_eps_consistency_batch_bits = 119.9
-
-[[levels]]
-log_inv_rate = 3
-log_msg_cols = 15
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 79
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 214.8
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 236.2
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
-
-[[levels]]
-log_inv_rate = 5
-log_msg_cols = 12
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 48
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 10
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 216.8
-expected_eps_query_bits = 112.6
-expected_eps_ood_bits = 234.7
-expected_eps_claim_batch_bits = 120.9
-expected_eps_sumcheck_bits = 247.9
-expected_eps_consistency_batch_bits = 118.3
-
-[[levels]]
-log_inv_rate = 7
-log_msg_cols = 9
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 35
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 9
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 218.0
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 233.3
-expected_eps_claim_batch_bits = 119.9
-expected_eps_sumcheck_bits = 246.9
-expected_eps_consistency_batch_bits = 117.3
-
-[[levels]]
-log_inv_rate = 9
-log_msg_cols = 6
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 29
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 10
-consistency_batch_grinding_bits = 12
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 216.0
-expected_eps_query_bits = 114.9
-expected_eps_ood_bits = 232.1
-expected_eps_claim_batch_bits = 118.9
-expected_eps_sumcheck_bits = 245.9
-expected_eps_consistency_batch_bits = 116.5
-
-[[levels]]
-log_inv_rate = 11
-log_msg_cols = 3
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 25
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 11
-consistency_batch_grinding_bits = 13
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 214.0
-expected_eps_query_bits = 114.3
-expected_eps_ood_bits = 231.1
-expected_eps_claim_batch_bits = 117.9
-expected_eps_sumcheck_bits = 244.9
-expected_eps_consistency_batch_bits = 115.5
-
-[final_block]
-yr_log_n = 3
diff --git a/crates/flock-core/configs/ligerito/m31_slim.toml b/crates/flock-core/configs/ligerito/m31_slim.toml
index c9ea3aa6..b30a52a9 100644
--- a/crates/flock-core/configs/ligerito/m31_slim.toml
+++ b/crates/flock-core/configs/ligerito/m31_slim.toml
@@ -29,109 +29,109 @@ expected_eps_sumcheck_bits = 249.4
 expected_eps_consistency_batch_bits = 119.5
 
 [[levels]]
-log_inv_rate = 3
+log_inv_rate = 4
 log_msg_cols = 15
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 79
+queries = 60
 grinding_bits = 16
 fold_grinding_bits = 0
 claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 10
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 214.8
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 236.2
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
+expected_eps_pg_bits = 214.1
+expected_eps_query_bits = 113.3
+expected_eps_ood_bits = 235.2
+expected_eps_claim_batch_bits = 121.4
+expected_eps_sumcheck_bits = 248.4
+expected_eps_consistency_batch_bits = 118.8
 
 [[levels]]
-log_inv_rate = 4
+log_inv_rate = 6
 log_msg_cols = 12
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 60
+queries = 41
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 8
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 217.1
-expected_eps_query_bits = 113.3
-expected_eps_ood_bits = 235.7
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.8
+expected_eps_pg_bits = 215.7
+expected_eps_query_bits = 114.2
+expected_eps_ood_bits = 233.7
+expected_eps_claim_batch_bits = 120.4
+expected_eps_sumcheck_bits = 247.4
+expected_eps_consistency_batch_bits = 117.8
 
 [[levels]]
-log_inv_rate = 5
+log_inv_rate = 8
 log_msg_cols = 9
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 48
+queries = 32
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 219.8
-expected_eps_query_bits = 112.6
-expected_eps_ood_bits = 235.3
-expected_eps_claim_batch_bits = 120.9
-expected_eps_sumcheck_bits = 247.9
-expected_eps_consistency_batch_bits = 118.3
+expected_eps_pg_bits = 215.5
+expected_eps_query_bits = 115.2
+expected_eps_ood_bits = 232.3
+expected_eps_claim_batch_bits = 119.4
+expected_eps_sumcheck_bits = 246.4
+expected_eps_consistency_batch_bits = 117.0
 
 [[levels]]
-log_inv_rate = 6
+log_inv_rate = 10
 log_msg_cols = 6
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 41
+queries = 27
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 11
+claim_batch_grinding_bits = 10
+consistency_batch_grinding_bits = 12
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 221.7
-expected_eps_query_bits = 114.2
-expected_eps_ood_bits = 235.1
-expected_eps_claim_batch_bits = 120.4
-expected_eps_sumcheck_bits = 247.4
-expected_eps_consistency_batch_bits = 117.8
+expected_eps_pg_bits = 213.5
+expected_eps_query_bits = 115.7
+expected_eps_ood_bits = 231.1
+expected_eps_claim_batch_bits = 118.4
+expected_eps_sumcheck_bits = 245.4
+expected_eps_consistency_batch_bits = 116.0
 
 [[levels]]
-log_inv_rate = 7
+log_inv_rate = 12
 log_msg_cols = 3
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 35
+queries = 24
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 9
-consistency_batch_grinding_bits = 11
+claim_batch_grinding_bits = 11
+consistency_batch_grinding_bits = 13
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 224.0
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 235.1
-expected_eps_claim_batch_bits = 119.9
-expected_eps_sumcheck_bits = 246.9
-expected_eps_consistency_batch_bits = 117.3
+expected_eps_pg_bits = 211.5
+expected_eps_query_bits = 115.5
+expected_eps_ood_bits = 230.1
+expected_eps_claim_batch_bits = 117.4
+expected_eps_sumcheck_bits = 244.4
+expected_eps_consistency_batch_bits = 115.0
 
 [final_block]
 yr_log_n = 3
diff --git a/crates/flock-core/configs/ligerito/m31_slim128.toml b/crates/flock-core/configs/ligerito/m31_slim128.toml
deleted file mode 100644
index b30a52a9..00000000
--- a/crates/flock-core/configs/ligerito/m31_slim128.toml
+++ /dev/null
@@ -1,137 +0,0 @@
-m = 31
-log_n = 24
-initial_k = 6
-target_security_bits = 100
-analysis_version = "f256_split_johnson_two_point_ood_query128_c3_algebraic_row_union_over_bchks25_thm_4_6"
-field = "f256"
-hash = "sha256"
-grinding_step = "post_commit_pre_queries"
-
-[[levels]]
-log_inv_rate = 2
-log_msg_cols = 18
-log_num_interleaved = 6
-k_recursive = 6
-regime = "johnson_ood"
-eta = 0.02
-queries = 119
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
-consistency_batch_grinding_bits = 9
-ood_samples = 1
-target_security_bits = 100
-expected_eps_pg_bits = 209.8
-expected_eps_query_bits = 112.3
-expected_eps_ood_bits = 236.2
-expected_eps_claim_batch_bits = 122.4
-expected_eps_sumcheck_bits = 249.4
-expected_eps_consistency_batch_bits = 119.5
-
-[[levels]]
-log_inv_rate = 4
-log_msg_cols = 15
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 60
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 214.1
-expected_eps_query_bits = 113.3
-expected_eps_ood_bits = 235.2
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.8
-
-[[levels]]
-log_inv_rate = 6
-log_msg_cols = 12
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 41
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 215.7
-expected_eps_query_bits = 114.2
-expected_eps_ood_bits = 233.7
-expected_eps_claim_batch_bits = 120.4
-expected_eps_sumcheck_bits = 247.4
-expected_eps_consistency_batch_bits = 117.8
-
-[[levels]]
-log_inv_rate = 8
-log_msg_cols = 9
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 32
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 9
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 215.5
-expected_eps_query_bits = 115.2
-expected_eps_ood_bits = 232.3
-expected_eps_claim_batch_bits = 119.4
-expected_eps_sumcheck_bits = 246.4
-expected_eps_consistency_batch_bits = 117.0
-
-[[levels]]
-log_inv_rate = 10
-log_msg_cols = 6
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 27
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 10
-consistency_batch_grinding_bits = 12
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 213.5
-expected_eps_query_bits = 115.7
-expected_eps_ood_bits = 231.1
-expected_eps_claim_batch_bits = 118.4
-expected_eps_sumcheck_bits = 245.4
-expected_eps_consistency_batch_bits = 116.0
-
-[[levels]]
-log_inv_rate = 12
-log_msg_cols = 3
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 24
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 11
-consistency_batch_grinding_bits = 13
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 211.5
-expected_eps_query_bits = 115.5
-expected_eps_ood_bits = 230.1
-expected_eps_claim_batch_bits = 117.4
-expected_eps_sumcheck_bits = 244.4
-expected_eps_consistency_batch_bits = 115.0
-
-[final_block]
-yr_log_n = 3
diff --git a/crates/flock-core/configs/ligerito/m32_fast.toml b/crates/flock-core/configs/ligerito/m32_fast.toml
index cd77f7d7..cf06c928 100644
--- a/crates/flock-core/configs/ligerito/m32_fast.toml
+++ b/crates/flock-core/configs/ligerito/m32_fast.toml
@@ -14,124 +14,124 @@ log_num_interleaved = 6
 k_recursive = 6
 regime = "johnson_ood"
 eta = 0.02
-queries = 279
-grinding_bits = 0
+queries = 244
+grinding_bits = 16
 fold_grinding_bits = 0
 claim_batch_grinding_bits = 6
 consistency_batch_grinding_bits = 9
 ood_samples = 1
 target_security_bits = 100
 expected_eps_pg_bits = 209.0
-expected_eps_query_bits = 128.3
+expected_eps_query_bits = 112.2
 expected_eps_ood_bits = 237.1
 expected_eps_claim_batch_bits = 122.9
 expected_eps_sumcheck_bits = 249.9
-expected_eps_consistency_batch_bits = 119.7
+expected_eps_consistency_batch_bits = 119.9
 
 [[levels]]
-log_inv_rate = 2
+log_inv_rate = 3
 log_msg_cols = 16
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 136
-grinding_bits = 0
+queries = 79
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
+claim_batch_grinding_bits = 7
 consistency_batch_grinding_bits = 9
 ood_samples = 2
 target_security_bits = 100
 expected_eps_pg_bits = 213.8
-expected_eps_query_bits = 128.3
-expected_eps_ood_bits = 237.1
-expected_eps_claim_batch_bits = 122.4
-expected_eps_sumcheck_bits = 249.4
-expected_eps_consistency_batch_bits = 119.4
+expected_eps_query_bits = 112.2
+expected_eps_ood_bits = 236.1
+expected_eps_claim_batch_bits = 121.9
+expected_eps_sumcheck_bits = 248.9
+expected_eps_consistency_batch_bits = 119.0
 
 [[levels]]
-log_inv_rate = 3
+log_inv_rate = 5
 log_msg_cols = 13
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 91
-grinding_bits = 0
+queries = 48
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
+claim_batch_grinding_bits = 8
+consistency_batch_grinding_bits = 10
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 216.8
-expected_eps_query_bits = 129.3
-expected_eps_ood_bits = 236.5
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
+expected_eps_pg_bits = 215.8
+expected_eps_query_bits = 112.6
+expected_eps_ood_bits = 234.5
+expected_eps_claim_batch_bits = 120.9
+expected_eps_sumcheck_bits = 247.9
+expected_eps_consistency_batch_bits = 118.3
 
 [[levels]]
-log_inv_rate = 4
+log_inv_rate = 7
 log_msg_cols = 10
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 68
-grinding_bits = 0
+queries = 35
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 219.1
-expected_eps_query_bits = 128.4
-expected_eps_ood_bits = 236.1
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.5
+expected_eps_pg_bits = 217.0
+expected_eps_query_bits = 112.2
+expected_eps_ood_bits = 233.1
+expected_eps_claim_batch_bits = 119.9
+expected_eps_sumcheck_bits = 246.9
+expected_eps_consistency_batch_bits = 117.3
 
 [[levels]]
-log_inv_rate = 5
+log_inv_rate = 9
 log_msg_cols = 7
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 55
-grinding_bits = 0
+queries = 29
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 10
+consistency_batch_grinding_bits = 12
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 221.8
-expected_eps_query_bits = 129.0
-expected_eps_ood_bits = 235.8
-expected_eps_claim_batch_bits = 120.9
-expected_eps_sumcheck_bits = 247.9
-expected_eps_consistency_batch_bits = 118.3
+expected_eps_pg_bits = 215.0
+expected_eps_query_bits = 114.9
+expected_eps_ood_bits = 231.8
+expected_eps_claim_batch_bits = 118.9
+expected_eps_sumcheck_bits = 245.9
+expected_eps_consistency_batch_bits = 116.5
 
 [[levels]]
-log_inv_rate = 6
+log_inv_rate = 11
 log_msg_cols = 4
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 46
-grinding_bits = 0
+queries = 25
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 11
+claim_batch_grinding_bits = 11
+consistency_batch_grinding_bits = 13
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 223.7
-expected_eps_query_bits = 128.2
-expected_eps_ood_bits = 235.7
-expected_eps_claim_batch_bits = 120.4
-expected_eps_sumcheck_bits = 247.4
-expected_eps_consistency_batch_bits = 117.8
+expected_eps_pg_bits = 213.0
+expected_eps_query_bits = 114.3
+expected_eps_ood_bits = 230.7
+expected_eps_claim_batch_bits = 117.9
+expected_eps_sumcheck_bits = 244.9
+expected_eps_consistency_batch_bits = 115.5
 
 [final_block]
 yr_log_n = 4
diff --git a/crates/flock-core/configs/ligerito/m32_fast128.toml b/crates/flock-core/configs/ligerito/m32_fast128.toml
deleted file mode 100644
index cf06c928..00000000
--- a/crates/flock-core/configs/ligerito/m32_fast128.toml
+++ /dev/null
@@ -1,137 +0,0 @@
-m = 32
-log_n = 25
-initial_k = 6
-target_security_bits = 100
-analysis_version = "f256_split_johnson_two_point_ood_query128_c3_algebraic_row_union_over_bchks25_thm_4_6"
-field = "f256"
-hash = "sha256"
-grinding_step = "post_commit_pre_queries"
-
-[[levels]]
-log_inv_rate = 1
-log_msg_cols = 19
-log_num_interleaved = 6
-k_recursive = 6
-regime = "johnson_ood"
-eta = 0.02
-queries = 244
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
-consistency_batch_grinding_bits = 9
-ood_samples = 1
-target_security_bits = 100
-expected_eps_pg_bits = 209.0
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 237.1
-expected_eps_claim_batch_bits = 122.9
-expected_eps_sumcheck_bits = 249.9
-expected_eps_consistency_batch_bits = 119.9
-
-[[levels]]
-log_inv_rate = 3
-log_msg_cols = 16
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 79
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 213.8
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 236.1
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
-
-[[levels]]
-log_inv_rate = 5
-log_msg_cols = 13
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 48
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 10
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 215.8
-expected_eps_query_bits = 112.6
-expected_eps_ood_bits = 234.5
-expected_eps_claim_batch_bits = 120.9
-expected_eps_sumcheck_bits = 247.9
-expected_eps_consistency_batch_bits = 118.3
-
-[[levels]]
-log_inv_rate = 7
-log_msg_cols = 10
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 35
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 9
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 217.0
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 233.1
-expected_eps_claim_batch_bits = 119.9
-expected_eps_sumcheck_bits = 246.9
-expected_eps_consistency_batch_bits = 117.3
-
-[[levels]]
-log_inv_rate = 9
-log_msg_cols = 7
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 29
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 10
-consistency_batch_grinding_bits = 12
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 215.0
-expected_eps_query_bits = 114.9
-expected_eps_ood_bits = 231.8
-expected_eps_claim_batch_bits = 118.9
-expected_eps_sumcheck_bits = 245.9
-expected_eps_consistency_batch_bits = 116.5
-
-[[levels]]
-log_inv_rate = 11
-log_msg_cols = 4
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 25
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 11
-consistency_batch_grinding_bits = 13
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 213.0
-expected_eps_query_bits = 114.3
-expected_eps_ood_bits = 230.7
-expected_eps_claim_batch_bits = 117.9
-expected_eps_sumcheck_bits = 244.9
-expected_eps_consistency_batch_bits = 115.5
-
-[final_block]
-yr_log_n = 4
diff --git a/crates/flock-core/configs/ligerito/m32_slim.toml b/crates/flock-core/configs/ligerito/m32_slim.toml
index c6551b89..b82ec72f 100644
--- a/crates/flock-core/configs/ligerito/m32_slim.toml
+++ b/crates/flock-core/configs/ligerito/m32_slim.toml
@@ -29,109 +29,109 @@ expected_eps_sumcheck_bits = 249.4
 expected_eps_consistency_batch_bits = 119.5
 
 [[levels]]
-log_inv_rate = 3
+log_inv_rate = 4
 log_msg_cols = 16
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 79
+queries = 60
 grinding_bits = 16
 fold_grinding_bits = 0
 claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 10
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 213.8
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 236.1
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
+expected_eps_pg_bits = 213.1
+expected_eps_query_bits = 113.3
+expected_eps_ood_bits = 235.1
+expected_eps_claim_batch_bits = 121.4
+expected_eps_sumcheck_bits = 248.4
+expected_eps_consistency_batch_bits = 118.8
 
 [[levels]]
-log_inv_rate = 4
+log_inv_rate = 6
 log_msg_cols = 13
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 60
+queries = 41
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 8
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 216.1
-expected_eps_query_bits = 113.3
-expected_eps_ood_bits = 235.5
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.8
+expected_eps_pg_bits = 214.7
+expected_eps_query_bits = 114.2
+expected_eps_ood_bits = 233.5
+expected_eps_claim_batch_bits = 120.4
+expected_eps_sumcheck_bits = 247.4
+expected_eps_consistency_batch_bits = 117.8
 
 [[levels]]
-log_inv_rate = 5
+log_inv_rate = 8
 log_msg_cols = 10
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 48
+queries = 32
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 218.8
-expected_eps_query_bits = 112.6
-expected_eps_ood_bits = 235.1
-expected_eps_claim_batch_bits = 120.9
-expected_eps_sumcheck_bits = 247.9
-expected_eps_consistency_batch_bits = 118.3
+expected_eps_pg_bits = 214.5
+expected_eps_query_bits = 115.2
+expected_eps_ood_bits = 232.1
+expected_eps_claim_batch_bits = 119.4
+expected_eps_sumcheck_bits = 246.4
+expected_eps_consistency_batch_bits = 117.0
 
 [[levels]]
-log_inv_rate = 6
+log_inv_rate = 10
 log_msg_cols = 7
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 41
+queries = 27
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 11
+claim_batch_grinding_bits = 10
+consistency_batch_grinding_bits = 12
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 220.7
-expected_eps_query_bits = 114.2
-expected_eps_ood_bits = 234.8
-expected_eps_claim_batch_bits = 120.4
-expected_eps_sumcheck_bits = 247.4
-expected_eps_consistency_batch_bits = 117.8
+expected_eps_pg_bits = 212.5
+expected_eps_query_bits = 115.7
+expected_eps_ood_bits = 230.8
+expected_eps_claim_batch_bits = 118.4
+expected_eps_sumcheck_bits = 245.4
+expected_eps_consistency_batch_bits = 116.0
 
 [[levels]]
-log_inv_rate = 7
+log_inv_rate = 12
 log_msg_cols = 4
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 35
+queries = 24
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 9
-consistency_batch_grinding_bits = 11
+claim_batch_grinding_bits = 11
+consistency_batch_grinding_bits = 13
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 223.0
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 234.7
-expected_eps_claim_batch_bits = 119.9
-expected_eps_sumcheck_bits = 246.9
-expected_eps_consistency_batch_bits = 117.3
+expected_eps_pg_bits = 210.5
+expected_eps_query_bits = 115.5
+expected_eps_ood_bits = 229.7
+expected_eps_claim_batch_bits = 117.4
+expected_eps_sumcheck_bits = 244.4
+expected_eps_consistency_batch_bits = 115.0
 
 [final_block]
 yr_log_n = 4
diff --git a/crates/flock-core/configs/ligerito/m32_slim128.toml b/crates/flock-core/configs/ligerito/m32_slim128.toml
deleted file mode 100644
index b82ec72f..00000000
--- a/crates/flock-core/configs/ligerito/m32_slim128.toml
+++ /dev/null
@@ -1,137 +0,0 @@
-m = 32
-log_n = 25
-initial_k = 6
-target_security_bits = 100
-analysis_version = "f256_split_johnson_two_point_ood_query128_c3_algebraic_row_union_over_bchks25_thm_4_6"
-field = "f256"
-hash = "sha256"
-grinding_step = "post_commit_pre_queries"
-
-[[levels]]
-log_inv_rate = 2
-log_msg_cols = 19
-log_num_interleaved = 6
-k_recursive = 6
-regime = "johnson_ood"
-eta = 0.02
-queries = 119
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
-consistency_batch_grinding_bits = 9
-ood_samples = 1
-target_security_bits = 100
-expected_eps_pg_bits = 208.8
-expected_eps_query_bits = 112.3
-expected_eps_ood_bits = 236.1
-expected_eps_claim_batch_bits = 122.4
-expected_eps_sumcheck_bits = 249.4
-expected_eps_consistency_batch_bits = 119.5
-
-[[levels]]
-log_inv_rate = 4
-log_msg_cols = 16
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 60
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 213.1
-expected_eps_query_bits = 113.3
-expected_eps_ood_bits = 235.1
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.8
-
-[[levels]]
-log_inv_rate = 6
-log_msg_cols = 13
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 41
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 214.7
-expected_eps_query_bits = 114.2
-expected_eps_ood_bits = 233.5
-expected_eps_claim_batch_bits = 120.4
-expected_eps_sumcheck_bits = 247.4
-expected_eps_consistency_batch_bits = 117.8
-
-[[levels]]
-log_inv_rate = 8
-log_msg_cols = 10
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 32
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 9
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 214.5
-expected_eps_query_bits = 115.2
-expected_eps_ood_bits = 232.1
-expected_eps_claim_batch_bits = 119.4
-expected_eps_sumcheck_bits = 246.4
-expected_eps_consistency_batch_bits = 117.0
-
-[[levels]]
-log_inv_rate = 10
-log_msg_cols = 7
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 27
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 10
-consistency_batch_grinding_bits = 12
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 212.5
-expected_eps_query_bits = 115.7
-expected_eps_ood_bits = 230.8
-expected_eps_claim_batch_bits = 118.4
-expected_eps_sumcheck_bits = 245.4
-expected_eps_consistency_batch_bits = 116.0
-
-[[levels]]
-log_inv_rate = 12
-log_msg_cols = 4
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 24
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 11
-consistency_batch_grinding_bits = 13
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 210.5
-expected_eps_query_bits = 115.5
-expected_eps_ood_bits = 229.7
-expected_eps_claim_batch_bits = 117.4
-expected_eps_sumcheck_bits = 244.4
-expected_eps_consistency_batch_bits = 115.0
-
-[final_block]
-yr_log_n = 4
diff --git a/crates/flock-core/configs/ligerito/m33_fast.toml b/crates/flock-core/configs/ligerito/m33_fast.toml
index a3c945b8..af677bae 100644
--- a/crates/flock-core/configs/ligerito/m33_fast.toml
+++ b/crates/flock-core/configs/ligerito/m33_fast.toml
@@ -14,124 +14,124 @@ log_num_interleaved = 6
 k_recursive = 6
 regime = "johnson_ood"
 eta = 0.02
-queries = 279
-grinding_bits = 0
+queries = 244
+grinding_bits = 16
 fold_grinding_bits = 0
 claim_batch_grinding_bits = 6
 consistency_batch_grinding_bits = 9
 ood_samples = 1
 target_security_bits = 100
 expected_eps_pg_bits = 208.0
-expected_eps_query_bits = 128.3
+expected_eps_query_bits = 112.2
 expected_eps_ood_bits = 237.0
 expected_eps_claim_batch_bits = 122.9
 expected_eps_sumcheck_bits = 249.9
-expected_eps_consistency_batch_bits = 119.7
+expected_eps_consistency_batch_bits = 119.9
 
 [[levels]]
-log_inv_rate = 2
+log_inv_rate = 3
 log_msg_cols = 17
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 136
-grinding_bits = 0
+queries = 79
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
+claim_batch_grinding_bits = 7
 consistency_batch_grinding_bits = 9
 ood_samples = 2
 target_security_bits = 100
 expected_eps_pg_bits = 212.8
-expected_eps_query_bits = 128.3
-expected_eps_ood_bits = 236.9
-expected_eps_claim_batch_bits = 122.4
-expected_eps_sumcheck_bits = 249.4
-expected_eps_consistency_batch_bits = 119.4
+expected_eps_query_bits = 112.2
+expected_eps_ood_bits = 235.9
+expected_eps_claim_batch_bits = 121.9
+expected_eps_sumcheck_bits = 248.9
+expected_eps_consistency_batch_bits = 119.0
 
 [[levels]]
-log_inv_rate = 3
+log_inv_rate = 5
 log_msg_cols = 14
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 91
-grinding_bits = 0
+queries = 48
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
+claim_batch_grinding_bits = 8
+consistency_batch_grinding_bits = 10
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 215.8
-expected_eps_query_bits = 129.3
-expected_eps_ood_bits = 236.4
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
+expected_eps_pg_bits = 214.8
+expected_eps_query_bits = 112.6
+expected_eps_ood_bits = 234.4
+expected_eps_claim_batch_bits = 120.9
+expected_eps_sumcheck_bits = 247.9
+expected_eps_consistency_batch_bits = 118.3
 
 [[levels]]
-log_inv_rate = 4
+log_inv_rate = 7
 log_msg_cols = 11
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 68
-grinding_bits = 0
+queries = 35
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 218.1
-expected_eps_query_bits = 128.4
-expected_eps_ood_bits = 235.9
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.5
+expected_eps_pg_bits = 216.0
+expected_eps_query_bits = 112.2
+expected_eps_ood_bits = 232.9
+expected_eps_claim_batch_bits = 119.9
+expected_eps_sumcheck_bits = 246.9
+expected_eps_consistency_batch_bits = 117.3
 
 [[levels]]
-log_inv_rate = 5
+log_inv_rate = 9
 log_msg_cols = 8
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 55
-grinding_bits = 0
+queries = 29
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 10
+consistency_batch_grinding_bits = 12
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 220.8
-expected_eps_query_bits = 129.0
-expected_eps_ood_bits = 235.5
-expected_eps_claim_batch_bits = 120.9
-expected_eps_sumcheck_bits = 247.9
-expected_eps_consistency_batch_bits = 118.3
+expected_eps_pg_bits = 214.0
+expected_eps_query_bits = 114.9
+expected_eps_ood_bits = 231.5
+expected_eps_claim_batch_bits = 118.9
+expected_eps_sumcheck_bits = 245.9
+expected_eps_consistency_batch_bits = 116.5
 
 [[levels]]
-log_inv_rate = 6
+log_inv_rate = 11
 log_msg_cols = 5
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 46
-grinding_bits = 0
+queries = 25
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 11
+claim_batch_grinding_bits = 11
+consistency_batch_grinding_bits = 13
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 222.7
-expected_eps_query_bits = 128.2
-expected_eps_ood_bits = 235.4
-expected_eps_claim_batch_bits = 120.4
-expected_eps_sumcheck_bits = 247.4
-expected_eps_consistency_batch_bits = 117.8
+expected_eps_pg_bits = 212.0
+expected_eps_query_bits = 114.3
+expected_eps_ood_bits = 230.4
+expected_eps_claim_batch_bits = 117.9
+expected_eps_sumcheck_bits = 244.9
+expected_eps_consistency_batch_bits = 115.5
 
 [final_block]
 yr_log_n = 5
diff --git a/crates/flock-core/configs/ligerito/m33_fast128.toml b/crates/flock-core/configs/ligerito/m33_fast128.toml
deleted file mode 100644
index af677bae..00000000
--- a/crates/flock-core/configs/ligerito/m33_fast128.toml
+++ /dev/null
@@ -1,137 +0,0 @@
-m = 33
-log_n = 26
-initial_k = 6
-target_security_bits = 100
-analysis_version = "f256_split_johnson_two_point_ood_query128_c3_algebraic_row_union_over_bchks25_thm_4_6"
-field = "f256"
-hash = "sha256"
-grinding_step = "post_commit_pre_queries"
-
-[[levels]]
-log_inv_rate = 1
-log_msg_cols = 20
-log_num_interleaved = 6
-k_recursive = 6
-regime = "johnson_ood"
-eta = 0.02
-queries = 244
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
-consistency_batch_grinding_bits = 9
-ood_samples = 1
-target_security_bits = 100
-expected_eps_pg_bits = 208.0
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 237.0
-expected_eps_claim_batch_bits = 122.9
-expected_eps_sumcheck_bits = 249.9
-expected_eps_consistency_batch_bits = 119.9
-
-[[levels]]
-log_inv_rate = 3
-log_msg_cols = 17
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 79
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 212.8
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 235.9
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
-
-[[levels]]
-log_inv_rate = 5
-log_msg_cols = 14
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 48
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 10
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 214.8
-expected_eps_query_bits = 112.6
-expected_eps_ood_bits = 234.4
-expected_eps_claim_batch_bits = 120.9
-expected_eps_sumcheck_bits = 247.9
-expected_eps_consistency_batch_bits = 118.3
-
-[[levels]]
-log_inv_rate = 7
-log_msg_cols = 11
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 35
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 9
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 216.0
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 232.9
-expected_eps_claim_batch_bits = 119.9
-expected_eps_sumcheck_bits = 246.9
-expected_eps_consistency_batch_bits = 117.3
-
-[[levels]]
-log_inv_rate = 9
-log_msg_cols = 8
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 29
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 10
-consistency_batch_grinding_bits = 12
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 214.0
-expected_eps_query_bits = 114.9
-expected_eps_ood_bits = 231.5
-expected_eps_claim_batch_bits = 118.9
-expected_eps_sumcheck_bits = 245.9
-expected_eps_consistency_batch_bits = 116.5
-
-[[levels]]
-log_inv_rate = 11
-log_msg_cols = 5
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 25
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 11
-consistency_batch_grinding_bits = 13
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 212.0
-expected_eps_query_bits = 114.3
-expected_eps_ood_bits = 230.4
-expected_eps_claim_batch_bits = 117.9
-expected_eps_sumcheck_bits = 244.9
-expected_eps_consistency_batch_bits = 115.5
-
-[final_block]
-yr_log_n = 5
diff --git a/crates/flock-core/configs/ligerito/m33_slim.toml b/crates/flock-core/configs/ligerito/m33_slim.toml
index 1f5c5bb8..39fcd086 100644
--- a/crates/flock-core/configs/ligerito/m33_slim.toml
+++ b/crates/flock-core/configs/ligerito/m33_slim.toml
@@ -29,109 +29,109 @@ expected_eps_sumcheck_bits = 249.4
 expected_eps_consistency_batch_bits = 119.5
 
 [[levels]]
-log_inv_rate = 3
+log_inv_rate = 4
 log_msg_cols = 17
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 79
+queries = 60
 grinding_bits = 16
 fold_grinding_bits = 0
 claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 10
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 212.8
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 235.9
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
+expected_eps_pg_bits = 212.1
+expected_eps_query_bits = 113.3
+expected_eps_ood_bits = 234.9
+expected_eps_claim_batch_bits = 121.4
+expected_eps_sumcheck_bits = 248.4
+expected_eps_consistency_batch_bits = 118.8
 
 [[levels]]
-log_inv_rate = 4
+log_inv_rate = 6
 log_msg_cols = 14
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 60
+queries = 41
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 8
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 215.1
-expected_eps_query_bits = 113.3
-expected_eps_ood_bits = 235.4
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.8
+expected_eps_pg_bits = 213.7
+expected_eps_query_bits = 114.2
+expected_eps_ood_bits = 233.4
+expected_eps_claim_batch_bits = 120.4
+expected_eps_sumcheck_bits = 247.4
+expected_eps_consistency_batch_bits = 117.8
 
 [[levels]]
-log_inv_rate = 5
+log_inv_rate = 8
 log_msg_cols = 11
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 48
+queries = 32
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 217.8
-expected_eps_query_bits = 112.6
-expected_eps_ood_bits = 234.9
-expected_eps_claim_batch_bits = 120.9
-expected_eps_sumcheck_bits = 247.9
-expected_eps_consistency_batch_bits = 118.3
+expected_eps_pg_bits = 213.5
+expected_eps_query_bits = 115.2
+expected_eps_ood_bits = 231.9
+expected_eps_claim_batch_bits = 119.4
+expected_eps_sumcheck_bits = 246.4
+expected_eps_consistency_batch_bits = 117.0
 
 [[levels]]
-log_inv_rate = 6
+log_inv_rate = 10
 log_msg_cols = 8
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 41
+queries = 27
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 11
+claim_batch_grinding_bits = 10
+consistency_batch_grinding_bits = 12
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 219.7
-expected_eps_query_bits = 114.2
-expected_eps_ood_bits = 234.5
-expected_eps_claim_batch_bits = 120.4
-expected_eps_sumcheck_bits = 247.4
-expected_eps_consistency_batch_bits = 117.8
+expected_eps_pg_bits = 211.5
+expected_eps_query_bits = 115.7
+expected_eps_ood_bits = 230.5
+expected_eps_claim_batch_bits = 118.4
+expected_eps_sumcheck_bits = 245.4
+expected_eps_consistency_batch_bits = 116.0
 
 [[levels]]
-log_inv_rate = 7
+log_inv_rate = 12
 log_msg_cols = 5
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 35
+queries = 24
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 9
-consistency_batch_grinding_bits = 11
+claim_batch_grinding_bits = 11
+consistency_batch_grinding_bits = 13
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 222.0
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 234.4
-expected_eps_claim_batch_bits = 119.9
-expected_eps_sumcheck_bits = 246.9
-expected_eps_consistency_batch_bits = 117.3
+expected_eps_pg_bits = 209.5
+expected_eps_query_bits = 115.5
+expected_eps_ood_bits = 229.4
+expected_eps_claim_batch_bits = 117.4
+expected_eps_sumcheck_bits = 244.4
+expected_eps_consistency_batch_bits = 115.0
 
 [final_block]
 yr_log_n = 5
diff --git a/crates/flock-core/configs/ligerito/m33_slim128.toml b/crates/flock-core/configs/ligerito/m33_slim128.toml
deleted file mode 100644
index 39fcd086..00000000
--- a/crates/flock-core/configs/ligerito/m33_slim128.toml
+++ /dev/null
@@ -1,137 +0,0 @@
-m = 33
-log_n = 26
-initial_k = 6
-target_security_bits = 100
-analysis_version = "f256_split_johnson_two_point_ood_query128_c3_algebraic_row_union_over_bchks25_thm_4_6"
-field = "f256"
-hash = "sha256"
-grinding_step = "post_commit_pre_queries"
-
-[[levels]]
-log_inv_rate = 2
-log_msg_cols = 20
-log_num_interleaved = 6
-k_recursive = 6
-regime = "johnson_ood"
-eta = 0.02
-queries = 119
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
-consistency_batch_grinding_bits = 9
-ood_samples = 1
-target_security_bits = 100
-expected_eps_pg_bits = 207.8
-expected_eps_query_bits = 112.3
-expected_eps_ood_bits = 236.0
-expected_eps_claim_batch_bits = 122.4
-expected_eps_sumcheck_bits = 249.4
-expected_eps_consistency_batch_bits = 119.5
-
-[[levels]]
-log_inv_rate = 4
-log_msg_cols = 17
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 60
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 212.1
-expected_eps_query_bits = 113.3
-expected_eps_ood_bits = 234.9
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.8
-
-[[levels]]
-log_inv_rate = 6
-log_msg_cols = 14
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 41
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 213.7
-expected_eps_query_bits = 114.2
-expected_eps_ood_bits = 233.4
-expected_eps_claim_batch_bits = 120.4
-expected_eps_sumcheck_bits = 247.4
-expected_eps_consistency_batch_bits = 117.8
-
-[[levels]]
-log_inv_rate = 8
-log_msg_cols = 11
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 32
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 9
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 213.5
-expected_eps_query_bits = 115.2
-expected_eps_ood_bits = 231.9
-expected_eps_claim_batch_bits = 119.4
-expected_eps_sumcheck_bits = 246.4
-expected_eps_consistency_batch_bits = 117.0
-
-[[levels]]
-log_inv_rate = 10
-log_msg_cols = 8
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 27
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 10
-consistency_batch_grinding_bits = 12
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 211.5
-expected_eps_query_bits = 115.7
-expected_eps_ood_bits = 230.5
-expected_eps_claim_batch_bits = 118.4
-expected_eps_sumcheck_bits = 245.4
-expected_eps_consistency_batch_bits = 116.0
-
-[[levels]]
-log_inv_rate = 12
-log_msg_cols = 5
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 24
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 11
-consistency_batch_grinding_bits = 13
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 209.5
-expected_eps_query_bits = 115.5
-expected_eps_ood_bits = 229.4
-expected_eps_claim_batch_bits = 117.4
-expected_eps_sumcheck_bits = 244.4
-expected_eps_consistency_batch_bits = 115.0
-
-[final_block]
-yr_log_n = 5
diff --git a/crates/flock-core/configs/ligerito/m34_fast.toml b/crates/flock-core/configs/ligerito/m34_fast.toml
index 775b9a50..a52c9b30 100644
--- a/crates/flock-core/configs/ligerito/m34_fast.toml
+++ b/crates/flock-core/configs/ligerito/m34_fast.toml
@@ -14,145 +14,145 @@ log_num_interleaved = 6
 k_recursive = 6
 regime = "johnson_ood"
 eta = 0.02
-queries = 279
-grinding_bits = 0
+queries = 244
+grinding_bits = 16
 fold_grinding_bits = 0
 claim_batch_grinding_bits = 6
 consistency_batch_grinding_bits = 9
 ood_samples = 1
 target_security_bits = 100
 expected_eps_pg_bits = 207.0
-expected_eps_query_bits = 128.3
+expected_eps_query_bits = 112.2
 expected_eps_ood_bits = 236.9
 expected_eps_claim_batch_bits = 122.9
 expected_eps_sumcheck_bits = 249.9
-expected_eps_consistency_batch_bits = 119.7
+expected_eps_consistency_batch_bits = 119.9
 
 [[levels]]
-log_inv_rate = 2
+log_inv_rate = 3
 log_msg_cols = 18
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 136
-grinding_bits = 0
+queries = 79
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
+claim_batch_grinding_bits = 7
 consistency_batch_grinding_bits = 9
 ood_samples = 2
 target_security_bits = 100
 expected_eps_pg_bits = 211.8
-expected_eps_query_bits = 128.3
-expected_eps_ood_bits = 236.8
-expected_eps_claim_batch_bits = 122.4
-expected_eps_sumcheck_bits = 249.4
-expected_eps_consistency_batch_bits = 119.4
+expected_eps_query_bits = 112.2
+expected_eps_ood_bits = 235.8
+expected_eps_claim_batch_bits = 121.9
+expected_eps_sumcheck_bits = 248.9
+expected_eps_consistency_batch_bits = 119.0
 
 [[levels]]
-log_inv_rate = 3
+log_inv_rate = 5
 log_msg_cols = 15
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 91
-grinding_bits = 0
+queries = 48
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
+claim_batch_grinding_bits = 8
+consistency_batch_grinding_bits = 10
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 214.8
-expected_eps_query_bits = 129.3
-expected_eps_ood_bits = 236.2
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
+expected_eps_pg_bits = 213.8
+expected_eps_query_bits = 112.6
+expected_eps_ood_bits = 234.2
+expected_eps_claim_batch_bits = 120.9
+expected_eps_sumcheck_bits = 247.9
+expected_eps_consistency_batch_bits = 118.3
 
 [[levels]]
-log_inv_rate = 4
+log_inv_rate = 7
 log_msg_cols = 12
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 68
-grinding_bits = 0
+queries = 35
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 217.1
-expected_eps_query_bits = 128.4
-expected_eps_ood_bits = 235.7
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.5
+expected_eps_pg_bits = 215.0
+expected_eps_query_bits = 112.2
+expected_eps_ood_bits = 232.7
+expected_eps_claim_batch_bits = 119.9
+expected_eps_sumcheck_bits = 246.9
+expected_eps_consistency_batch_bits = 117.3
 
 [[levels]]
-log_inv_rate = 5
+log_inv_rate = 9
 log_msg_cols = 9
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 55
-grinding_bits = 0
+queries = 29
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 10
+consistency_batch_grinding_bits = 12
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 219.8
-expected_eps_query_bits = 129.0
-expected_eps_ood_bits = 235.3
-expected_eps_claim_batch_bits = 120.9
-expected_eps_sumcheck_bits = 247.9
-expected_eps_consistency_batch_bits = 118.3
+expected_eps_pg_bits = 213.0
+expected_eps_query_bits = 114.9
+expected_eps_ood_bits = 231.3
+expected_eps_claim_batch_bits = 118.9
+expected_eps_sumcheck_bits = 245.9
+expected_eps_consistency_batch_bits = 116.5
 
 [[levels]]
-log_inv_rate = 6
+log_inv_rate = 11
 log_msg_cols = 6
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 46
-grinding_bits = 0
+queries = 25
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 11
+claim_batch_grinding_bits = 11
+consistency_batch_grinding_bits = 13
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 221.7
-expected_eps_query_bits = 128.2
-expected_eps_ood_bits = 235.1
-expected_eps_claim_batch_bits = 120.4
-expected_eps_sumcheck_bits = 247.4
-expected_eps_consistency_batch_bits = 117.8
+expected_eps_pg_bits = 211.0
+expected_eps_query_bits = 114.3
+expected_eps_ood_bits = 230.1
+expected_eps_claim_batch_bits = 117.9
+expected_eps_sumcheck_bits = 244.9
+expected_eps_consistency_batch_bits = 115.5
 
 [[levels]]
-log_inv_rate = 7
+log_inv_rate = 13
 log_msg_cols = 3
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 40
-grinding_bits = 0
+queries = 23
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 9
-consistency_batch_grinding_bits = 11
+claim_batch_grinding_bits = 12
+consistency_batch_grinding_bits = 14
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 224.0
-expected_eps_query_bits = 128.2
-expected_eps_ood_bits = 235.1
-expected_eps_claim_batch_bits = 119.9
-expected_eps_sumcheck_bits = 246.9
-expected_eps_consistency_batch_bits = 117.3
+expected_eps_pg_bits = 209.0
+expected_eps_query_bits = 115.2
+expected_eps_ood_bits = 229.1
+expected_eps_claim_batch_bits = 116.9
+expected_eps_sumcheck_bits = 243.9
+expected_eps_consistency_batch_bits = 114.5
 
 [final_block]
 yr_log_n = 3
diff --git a/crates/flock-core/configs/ligerito/m34_fast128.toml b/crates/flock-core/configs/ligerito/m34_fast128.toml
deleted file mode 100644
index a52c9b30..00000000
--- a/crates/flock-core/configs/ligerito/m34_fast128.toml
+++ /dev/null
@@ -1,158 +0,0 @@
-m = 34
-log_n = 27
-initial_k = 6
-target_security_bits = 100
-analysis_version = "f256_split_johnson_two_point_ood_query128_c3_algebraic_row_union_over_bchks25_thm_4_6"
-field = "f256"
-hash = "sha256"
-grinding_step = "post_commit_pre_queries"
-
-[[levels]]
-log_inv_rate = 1
-log_msg_cols = 21
-log_num_interleaved = 6
-k_recursive = 6
-regime = "johnson_ood"
-eta = 0.02
-queries = 244
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
-consistency_batch_grinding_bits = 9
-ood_samples = 1
-target_security_bits = 100
-expected_eps_pg_bits = 207.0
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 236.9
-expected_eps_claim_batch_bits = 122.9
-expected_eps_sumcheck_bits = 249.9
-expected_eps_consistency_batch_bits = 119.9
-
-[[levels]]
-log_inv_rate = 3
-log_msg_cols = 18
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 79
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 211.8
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 235.8
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
-
-[[levels]]
-log_inv_rate = 5
-log_msg_cols = 15
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 48
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 10
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 213.8
-expected_eps_query_bits = 112.6
-expected_eps_ood_bits = 234.2
-expected_eps_claim_batch_bits = 120.9
-expected_eps_sumcheck_bits = 247.9
-expected_eps_consistency_batch_bits = 118.3
-
-[[levels]]
-log_inv_rate = 7
-log_msg_cols = 12
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 35
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 9
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 215.0
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 232.7
-expected_eps_claim_batch_bits = 119.9
-expected_eps_sumcheck_bits = 246.9
-expected_eps_consistency_batch_bits = 117.3
-
-[[levels]]
-log_inv_rate = 9
-log_msg_cols = 9
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 29
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 10
-consistency_batch_grinding_bits = 12
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 213.0
-expected_eps_query_bits = 114.9
-expected_eps_ood_bits = 231.3
-expected_eps_claim_batch_bits = 118.9
-expected_eps_sumcheck_bits = 245.9
-expected_eps_consistency_batch_bits = 116.5
-
-[[levels]]
-log_inv_rate = 11
-log_msg_cols = 6
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 25
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 11
-consistency_batch_grinding_bits = 13
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 211.0
-expected_eps_query_bits = 114.3
-expected_eps_ood_bits = 230.1
-expected_eps_claim_batch_bits = 117.9
-expected_eps_sumcheck_bits = 244.9
-expected_eps_consistency_batch_bits = 115.5
-
-[[levels]]
-log_inv_rate = 13
-log_msg_cols = 3
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 23
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 12
-consistency_batch_grinding_bits = 14
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 209.0
-expected_eps_query_bits = 115.2
-expected_eps_ood_bits = 229.1
-expected_eps_claim_batch_bits = 116.9
-expected_eps_sumcheck_bits = 243.9
-expected_eps_consistency_batch_bits = 114.5
-
-[final_block]
-yr_log_n = 3
diff --git a/crates/flock-core/configs/ligerito/m34_slim.toml b/crates/flock-core/configs/ligerito/m34_slim.toml
index b38e4620..8eaadac7 100644
--- a/crates/flock-core/configs/ligerito/m34_slim.toml
+++ b/crates/flock-core/configs/ligerito/m34_slim.toml
@@ -29,130 +29,130 @@ expected_eps_sumcheck_bits = 249.4
 expected_eps_consistency_batch_bits = 119.5
 
 [[levels]]
-log_inv_rate = 3
+log_inv_rate = 4
 log_msg_cols = 18
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 79
+queries = 60
 grinding_bits = 16
 fold_grinding_bits = 0
 claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 10
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 211.8
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 235.8
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
+expected_eps_pg_bits = 211.1
+expected_eps_query_bits = 113.3
+expected_eps_ood_bits = 234.8
+expected_eps_claim_batch_bits = 121.4
+expected_eps_sumcheck_bits = 248.4
+expected_eps_consistency_batch_bits = 118.8
 
 [[levels]]
-log_inv_rate = 4
+log_inv_rate = 6
 log_msg_cols = 15
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 60
+queries = 41
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 8
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 214.1
-expected_eps_query_bits = 113.3
-expected_eps_ood_bits = 235.2
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.8
+expected_eps_pg_bits = 212.7
+expected_eps_query_bits = 114.2
+expected_eps_ood_bits = 233.2
+expected_eps_claim_batch_bits = 120.4
+expected_eps_sumcheck_bits = 247.4
+expected_eps_consistency_batch_bits = 117.8
 
 [[levels]]
-log_inv_rate = 5
+log_inv_rate = 8
 log_msg_cols = 12
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 48
+queries = 32
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 216.8
-expected_eps_query_bits = 112.6
-expected_eps_ood_bits = 234.7
-expected_eps_claim_batch_bits = 120.9
-expected_eps_sumcheck_bits = 247.9
-expected_eps_consistency_batch_bits = 118.3
+expected_eps_pg_bits = 212.5
+expected_eps_query_bits = 115.2
+expected_eps_ood_bits = 231.7
+expected_eps_claim_batch_bits = 119.4
+expected_eps_sumcheck_bits = 246.4
+expected_eps_consistency_batch_bits = 117.0
 
 [[levels]]
-log_inv_rate = 6
+log_inv_rate = 10
 log_msg_cols = 9
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 41
+queries = 27
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 11
+claim_batch_grinding_bits = 10
+consistency_batch_grinding_bits = 12
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 218.7
-expected_eps_query_bits = 114.2
-expected_eps_ood_bits = 234.3
-expected_eps_claim_batch_bits = 120.4
-expected_eps_sumcheck_bits = 247.4
-expected_eps_consistency_batch_bits = 117.8
+expected_eps_pg_bits = 210.5
+expected_eps_query_bits = 115.7
+expected_eps_ood_bits = 230.3
+expected_eps_claim_batch_bits = 118.4
+expected_eps_sumcheck_bits = 245.4
+expected_eps_consistency_batch_bits = 116.0
 
 [[levels]]
-log_inv_rate = 7
+log_inv_rate = 12
 log_msg_cols = 6
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 35
+queries = 24
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 9
-consistency_batch_grinding_bits = 11
+claim_batch_grinding_bits = 11
+consistency_batch_grinding_bits = 13
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 221.0
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 234.1
-expected_eps_claim_batch_bits = 119.9
-expected_eps_sumcheck_bits = 246.9
-expected_eps_consistency_batch_bits = 117.3
+expected_eps_pg_bits = 208.5
+expected_eps_query_bits = 115.5
+expected_eps_ood_bits = 229.1
+expected_eps_claim_batch_bits = 117.4
+expected_eps_sumcheck_bits = 244.4
+expected_eps_consistency_batch_bits = 115.0
 
 [[levels]]
-log_inv_rate = 8
+log_inv_rate = 14
 log_msg_cols = 3
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 32
+queries = 22
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 9
-consistency_batch_grinding_bits = 11
+claim_batch_grinding_bits = 12
+consistency_batch_grinding_bits = 14
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 221.5
-expected_eps_query_bits = 115.2
-expected_eps_ood_bits = 234.1
-expected_eps_claim_batch_bits = 119.4
-expected_eps_sumcheck_bits = 246.4
-expected_eps_consistency_batch_bits = 117.0
+expected_eps_pg_bits = 206.5
+expected_eps_query_bits = 113.7
+expected_eps_ood_bits = 228.1
+expected_eps_claim_batch_bits = 116.4
+expected_eps_sumcheck_bits = 243.4
+expected_eps_consistency_batch_bits = 114.0
 
 [final_block]
 yr_log_n = 3
diff --git a/crates/flock-core/configs/ligerito/m34_slim128.toml b/crates/flock-core/configs/ligerito/m34_slim128.toml
deleted file mode 100644
index 8eaadac7..00000000
--- a/crates/flock-core/configs/ligerito/m34_slim128.toml
+++ /dev/null
@@ -1,158 +0,0 @@
-m = 34
-log_n = 27
-initial_k = 6
-target_security_bits = 100
-analysis_version = "f256_split_johnson_two_point_ood_query128_c3_algebraic_row_union_over_bchks25_thm_4_6"
-field = "f256"
-hash = "sha256"
-grinding_step = "post_commit_pre_queries"
-
-[[levels]]
-log_inv_rate = 2
-log_msg_cols = 21
-log_num_interleaved = 6
-k_recursive = 6
-regime = "johnson_ood"
-eta = 0.02
-queries = 119
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
-consistency_batch_grinding_bits = 9
-ood_samples = 1
-target_security_bits = 100
-expected_eps_pg_bits = 206.8
-expected_eps_query_bits = 112.3
-expected_eps_ood_bits = 235.9
-expected_eps_claim_batch_bits = 122.4
-expected_eps_sumcheck_bits = 249.4
-expected_eps_consistency_batch_bits = 119.5
-
-[[levels]]
-log_inv_rate = 4
-log_msg_cols = 18
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 60
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 211.1
-expected_eps_query_bits = 113.3
-expected_eps_ood_bits = 234.8
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.8
-
-[[levels]]
-log_inv_rate = 6
-log_msg_cols = 15
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 41
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 212.7
-expected_eps_query_bits = 114.2
-expected_eps_ood_bits = 233.2
-expected_eps_claim_batch_bits = 120.4
-expected_eps_sumcheck_bits = 247.4
-expected_eps_consistency_batch_bits = 117.8
-
-[[levels]]
-log_inv_rate = 8
-log_msg_cols = 12
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 32
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 9
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 212.5
-expected_eps_query_bits = 115.2
-expected_eps_ood_bits = 231.7
-expected_eps_claim_batch_bits = 119.4
-expected_eps_sumcheck_bits = 246.4
-expected_eps_consistency_batch_bits = 117.0
-
-[[levels]]
-log_inv_rate = 10
-log_msg_cols = 9
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 27
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 10
-consistency_batch_grinding_bits = 12
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 210.5
-expected_eps_query_bits = 115.7
-expected_eps_ood_bits = 230.3
-expected_eps_claim_batch_bits = 118.4
-expected_eps_sumcheck_bits = 245.4
-expected_eps_consistency_batch_bits = 116.0
-
-[[levels]]
-log_inv_rate = 12
-log_msg_cols = 6
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 24
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 11
-consistency_batch_grinding_bits = 13
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 208.5
-expected_eps_query_bits = 115.5
-expected_eps_ood_bits = 229.1
-expected_eps_claim_batch_bits = 117.4
-expected_eps_sumcheck_bits = 244.4
-expected_eps_consistency_batch_bits = 115.0
-
-[[levels]]
-log_inv_rate = 14
-log_msg_cols = 3
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 22
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 12
-consistency_batch_grinding_bits = 14
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 206.5
-expected_eps_query_bits = 113.7
-expected_eps_ood_bits = 228.1
-expected_eps_claim_batch_bits = 116.4
-expected_eps_sumcheck_bits = 243.4
-expected_eps_consistency_batch_bits = 114.0
-
-[final_block]
-yr_log_n = 3
diff --git a/crates/flock-core/configs/ligerito/m35_fast.toml b/crates/flock-core/configs/ligerito/m35_fast.toml
index df6421bb..559441b9 100644
--- a/crates/flock-core/configs/ligerito/m35_fast.toml
+++ b/crates/flock-core/configs/ligerito/m35_fast.toml
@@ -14,145 +14,145 @@ log_num_interleaved = 6
 k_recursive = 6
 regime = "johnson_ood"
 eta = 0.02
-queries = 279
-grinding_bits = 0
+queries = 244
+grinding_bits = 16
 fold_grinding_bits = 0
 claim_batch_grinding_bits = 6
 consistency_batch_grinding_bits = 9
 ood_samples = 1
 target_security_bits = 100
 expected_eps_pg_bits = 206.0
-expected_eps_query_bits = 128.3
+expected_eps_query_bits = 112.2
 expected_eps_ood_bits = 236.8
 expected_eps_claim_batch_bits = 122.9
 expected_eps_sumcheck_bits = 249.9
-expected_eps_consistency_batch_bits = 119.7
+expected_eps_consistency_batch_bits = 119.9
 
 [[levels]]
-log_inv_rate = 2
+log_inv_rate = 3
 log_msg_cols = 19
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 136
-grinding_bits = 0
+queries = 79
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
+claim_batch_grinding_bits = 7
 consistency_batch_grinding_bits = 9
 ood_samples = 2
 target_security_bits = 100
 expected_eps_pg_bits = 210.8
-expected_eps_query_bits = 128.3
-expected_eps_ood_bits = 236.7
-expected_eps_claim_batch_bits = 122.4
-expected_eps_sumcheck_bits = 249.4
-expected_eps_consistency_batch_bits = 119.4
+expected_eps_query_bits = 112.2
+expected_eps_ood_bits = 235.7
+expected_eps_claim_batch_bits = 121.9
+expected_eps_sumcheck_bits = 248.9
+expected_eps_consistency_batch_bits = 119.0
 
 [[levels]]
-log_inv_rate = 3
+log_inv_rate = 5
 log_msg_cols = 16
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 91
-grinding_bits = 0
+queries = 48
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
+claim_batch_grinding_bits = 8
+consistency_batch_grinding_bits = 10
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 213.8
-expected_eps_query_bits = 129.3
-expected_eps_ood_bits = 236.1
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
+expected_eps_pg_bits = 212.8
+expected_eps_query_bits = 112.6
+expected_eps_ood_bits = 234.1
+expected_eps_claim_batch_bits = 120.9
+expected_eps_sumcheck_bits = 247.9
+expected_eps_consistency_batch_bits = 118.3
 
 [[levels]]
-log_inv_rate = 4
+log_inv_rate = 7
 log_msg_cols = 13
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 68
-grinding_bits = 0
+queries = 35
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 216.1
-expected_eps_query_bits = 128.4
-expected_eps_ood_bits = 235.5
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.5
+expected_eps_pg_bits = 214.0
+expected_eps_query_bits = 112.2
+expected_eps_ood_bits = 232.5
+expected_eps_claim_batch_bits = 119.9
+expected_eps_sumcheck_bits = 246.9
+expected_eps_consistency_batch_bits = 117.3
 
 [[levels]]
-log_inv_rate = 5
+log_inv_rate = 9
 log_msg_cols = 10
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 55
-grinding_bits = 0
+queries = 29
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 10
+consistency_batch_grinding_bits = 12
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 218.8
-expected_eps_query_bits = 129.0
-expected_eps_ood_bits = 235.1
-expected_eps_claim_batch_bits = 120.9
-expected_eps_sumcheck_bits = 247.9
-expected_eps_consistency_batch_bits = 118.3
+expected_eps_pg_bits = 212.0
+expected_eps_query_bits = 114.9
+expected_eps_ood_bits = 231.1
+expected_eps_claim_batch_bits = 118.9
+expected_eps_sumcheck_bits = 245.9
+expected_eps_consistency_batch_bits = 116.5
 
 [[levels]]
-log_inv_rate = 6
+log_inv_rate = 11
 log_msg_cols = 7
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 46
-grinding_bits = 0
+queries = 25
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 11
+claim_batch_grinding_bits = 11
+consistency_batch_grinding_bits = 13
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 220.7
-expected_eps_query_bits = 128.2
-expected_eps_ood_bits = 234.8
-expected_eps_claim_batch_bits = 120.4
-expected_eps_sumcheck_bits = 247.4
-expected_eps_consistency_batch_bits = 117.8
+expected_eps_pg_bits = 210.0
+expected_eps_query_bits = 114.3
+expected_eps_ood_bits = 229.8
+expected_eps_claim_batch_bits = 117.9
+expected_eps_sumcheck_bits = 244.9
+expected_eps_consistency_batch_bits = 115.5
 
 [[levels]]
-log_inv_rate = 7
+log_inv_rate = 13
 log_msg_cols = 4
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 40
-grinding_bits = 0
+queries = 23
+grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 9
-consistency_batch_grinding_bits = 11
+claim_batch_grinding_bits = 12
+consistency_batch_grinding_bits = 14
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 223.0
-expected_eps_query_bits = 128.2
-expected_eps_ood_bits = 234.7
-expected_eps_claim_batch_bits = 119.9
-expected_eps_sumcheck_bits = 246.9
-expected_eps_consistency_batch_bits = 117.3
+expected_eps_pg_bits = 208.0
+expected_eps_query_bits = 115.2
+expected_eps_ood_bits = 228.7
+expected_eps_claim_batch_bits = 116.9
+expected_eps_sumcheck_bits = 243.9
+expected_eps_consistency_batch_bits = 114.5
 
 [final_block]
 yr_log_n = 4
diff --git a/crates/flock-core/configs/ligerito/m35_fast128.toml b/crates/flock-core/configs/ligerito/m35_fast128.toml
deleted file mode 100644
index 559441b9..00000000
--- a/crates/flock-core/configs/ligerito/m35_fast128.toml
+++ /dev/null
@@ -1,158 +0,0 @@
-m = 35
-log_n = 28
-initial_k = 6
-target_security_bits = 100
-analysis_version = "f256_split_johnson_two_point_ood_query128_c3_algebraic_row_union_over_bchks25_thm_4_6"
-field = "f256"
-hash = "sha256"
-grinding_step = "post_commit_pre_queries"
-
-[[levels]]
-log_inv_rate = 1
-log_msg_cols = 22
-log_num_interleaved = 6
-k_recursive = 6
-regime = "johnson_ood"
-eta = 0.02
-queries = 244
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
-consistency_batch_grinding_bits = 9
-ood_samples = 1
-target_security_bits = 100
-expected_eps_pg_bits = 206.0
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 236.8
-expected_eps_claim_batch_bits = 122.9
-expected_eps_sumcheck_bits = 249.9
-expected_eps_consistency_batch_bits = 119.9
-
-[[levels]]
-log_inv_rate = 3
-log_msg_cols = 19
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 79
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 210.8
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 235.7
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
-
-[[levels]]
-log_inv_rate = 5
-log_msg_cols = 16
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 48
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 10
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 212.8
-expected_eps_query_bits = 112.6
-expected_eps_ood_bits = 234.1
-expected_eps_claim_batch_bits = 120.9
-expected_eps_sumcheck_bits = 247.9
-expected_eps_consistency_batch_bits = 118.3
-
-[[levels]]
-log_inv_rate = 7
-log_msg_cols = 13
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 35
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 9
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 214.0
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 232.5
-expected_eps_claim_batch_bits = 119.9
-expected_eps_sumcheck_bits = 246.9
-expected_eps_consistency_batch_bits = 117.3
-
-[[levels]]
-log_inv_rate = 9
-log_msg_cols = 10
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 29
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 10
-consistency_batch_grinding_bits = 12
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 212.0
-expected_eps_query_bits = 114.9
-expected_eps_ood_bits = 231.1
-expected_eps_claim_batch_bits = 118.9
-expected_eps_sumcheck_bits = 245.9
-expected_eps_consistency_batch_bits = 116.5
-
-[[levels]]
-log_inv_rate = 11
-log_msg_cols = 7
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 25
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 11
-consistency_batch_grinding_bits = 13
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 210.0
-expected_eps_query_bits = 114.3
-expected_eps_ood_bits = 229.8
-expected_eps_claim_batch_bits = 117.9
-expected_eps_sumcheck_bits = 244.9
-expected_eps_consistency_batch_bits = 115.5
-
-[[levels]]
-log_inv_rate = 13
-log_msg_cols = 4
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 23
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 12
-consistency_batch_grinding_bits = 14
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 208.0
-expected_eps_query_bits = 115.2
-expected_eps_ood_bits = 228.7
-expected_eps_claim_batch_bits = 116.9
-expected_eps_sumcheck_bits = 243.9
-expected_eps_consistency_batch_bits = 114.5
-
-[final_block]
-yr_log_n = 4
diff --git a/crates/flock-core/configs/ligerito/m35_slim.toml b/crates/flock-core/configs/ligerito/m35_slim.toml
index 73cefb33..e96cc87a 100644
--- a/crates/flock-core/configs/ligerito/m35_slim.toml
+++ b/crates/flock-core/configs/ligerito/m35_slim.toml
@@ -29,130 +29,130 @@ expected_eps_sumcheck_bits = 249.4
 expected_eps_consistency_batch_bits = 119.5
 
 [[levels]]
-log_inv_rate = 3
+log_inv_rate = 4
 log_msg_cols = 19
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 79
+queries = 60
 grinding_bits = 16
 fold_grinding_bits = 0
 claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 10
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 210.8
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 235.7
-expected_eps_claim_batch_bits = 121.9
-expected_eps_sumcheck_bits = 248.9
-expected_eps_consistency_batch_bits = 119.0
+expected_eps_pg_bits = 210.1
+expected_eps_query_bits = 113.3
+expected_eps_ood_bits = 234.7
+expected_eps_claim_batch_bits = 121.4
+expected_eps_sumcheck_bits = 248.4
+expected_eps_consistency_batch_bits = 118.8
 
 [[levels]]
-log_inv_rate = 4
+log_inv_rate = 6
 log_msg_cols = 16
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 60
+queries = 41
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 8
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 213.1
-expected_eps_query_bits = 113.3
-expected_eps_ood_bits = 235.1
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.8
+expected_eps_pg_bits = 211.7
+expected_eps_query_bits = 114.2
+expected_eps_ood_bits = 233.1
+expected_eps_claim_batch_bits = 120.4
+expected_eps_sumcheck_bits = 247.4
+expected_eps_consistency_batch_bits = 117.8
 
 [[levels]]
-log_inv_rate = 5
+log_inv_rate = 8
 log_msg_cols = 13
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 48
+queries = 32
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 10
+claim_batch_grinding_bits = 9
+consistency_batch_grinding_bits = 11
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 215.8
-expected_eps_query_bits = 112.6
-expected_eps_ood_bits = 234.5
-expected_eps_claim_batch_bits = 120.9
-expected_eps_sumcheck_bits = 247.9
-expected_eps_consistency_batch_bits = 118.3
+expected_eps_pg_bits = 211.5
+expected_eps_query_bits = 115.2
+expected_eps_ood_bits = 231.5
+expected_eps_claim_batch_bits = 119.4
+expected_eps_sumcheck_bits = 246.4
+expected_eps_consistency_batch_bits = 117.0
 
 [[levels]]
-log_inv_rate = 6
+log_inv_rate = 10
 log_msg_cols = 10
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 41
+queries = 27
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 11
+claim_batch_grinding_bits = 10
+consistency_batch_grinding_bits = 12
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 217.7
-expected_eps_query_bits = 114.2
-expected_eps_ood_bits = 234.1
-expected_eps_claim_batch_bits = 120.4
-expected_eps_sumcheck_bits = 247.4
-expected_eps_consistency_batch_bits = 117.8
+expected_eps_pg_bits = 209.5
+expected_eps_query_bits = 115.7
+expected_eps_ood_bits = 230.1
+expected_eps_claim_batch_bits = 118.4
+expected_eps_sumcheck_bits = 245.4
+expected_eps_consistency_batch_bits = 116.0
 
 [[levels]]
-log_inv_rate = 7
+log_inv_rate = 12
 log_msg_cols = 7
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 35
+queries = 24
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 9
-consistency_batch_grinding_bits = 11
+claim_batch_grinding_bits = 11
+consistency_batch_grinding_bits = 13
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 220.0
-expected_eps_query_bits = 112.2
-expected_eps_ood_bits = 233.8
-expected_eps_claim_batch_bits = 119.9
-expected_eps_sumcheck_bits = 246.9
-expected_eps_consistency_batch_bits = 117.3
+expected_eps_pg_bits = 207.5
+expected_eps_query_bits = 115.5
+expected_eps_ood_bits = 228.8
+expected_eps_claim_batch_bits = 117.4
+expected_eps_sumcheck_bits = 244.4
+expected_eps_consistency_batch_bits = 115.0
 
 [[levels]]
-log_inv_rate = 8
+log_inv_rate = 14
 log_msg_cols = 4
 log_num_interleaved = 4
 k_recursive = 4
 regime = "johnson_ood"
 eta = 0.02
-queries = 32
+queries = 22
 grinding_bits = 16
 fold_grinding_bits = 0
-claim_batch_grinding_bits = 9
-consistency_batch_grinding_bits = 11
+claim_batch_grinding_bits = 12
+consistency_batch_grinding_bits = 14
 ood_samples = 2
 target_security_bits = 100
-expected_eps_pg_bits = 220.5
-expected_eps_query_bits = 115.2
-expected_eps_ood_bits = 233.7
-expected_eps_claim_batch_bits = 119.4
-expected_eps_sumcheck_bits = 246.4
-expected_eps_consistency_batch_bits = 117.0
+expected_eps_pg_bits = 205.5
+expected_eps_query_bits = 113.7
+expected_eps_ood_bits = 227.7
+expected_eps_claim_batch_bits = 116.4
+expected_eps_sumcheck_bits = 243.4
+expected_eps_consistency_batch_bits = 114.0
 
 [final_block]
 yr_log_n = 4
diff --git a/crates/flock-core/configs/ligerito/m35_slim128.toml b/crates/flock-core/configs/ligerito/m35_slim128.toml
deleted file mode 100644
index e96cc87a..00000000
--- a/crates/flock-core/configs/ligerito/m35_slim128.toml
+++ /dev/null
@@ -1,158 +0,0 @@
-m = 35
-log_n = 28
-initial_k = 6
-target_security_bits = 100
-analysis_version = "f256_split_johnson_two_point_ood_query128_c3_algebraic_row_union_over_bchks25_thm_4_6"
-field = "f256"
-hash = "sha256"
-grinding_step = "post_commit_pre_queries"
-
-[[levels]]
-log_inv_rate = 2
-log_msg_cols = 22
-log_num_interleaved = 6
-k_recursive = 6
-regime = "johnson_ood"
-eta = 0.02
-queries = 119
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 6
-consistency_batch_grinding_bits = 9
-ood_samples = 1
-target_security_bits = 100
-expected_eps_pg_bits = 205.8
-expected_eps_query_bits = 112.3
-expected_eps_ood_bits = 235.8
-expected_eps_claim_batch_bits = 122.4
-expected_eps_sumcheck_bits = 249.4
-expected_eps_consistency_batch_bits = 119.5
-
-[[levels]]
-log_inv_rate = 4
-log_msg_cols = 19
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 60
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 7
-consistency_batch_grinding_bits = 10
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 210.1
-expected_eps_query_bits = 113.3
-expected_eps_ood_bits = 234.7
-expected_eps_claim_batch_bits = 121.4
-expected_eps_sumcheck_bits = 248.4
-expected_eps_consistency_batch_bits = 118.8
-
-[[levels]]
-log_inv_rate = 6
-log_msg_cols = 16
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 41
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 8
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 211.7
-expected_eps_query_bits = 114.2
-expected_eps_ood_bits = 233.1
-expected_eps_claim_batch_bits = 120.4
-expected_eps_sumcheck_bits = 247.4
-expected_eps_consistency_batch_bits = 117.8
-
-[[levels]]
-log_inv_rate = 8
-log_msg_cols = 13
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 32
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 9
-consistency_batch_grinding_bits = 11
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 211.5
-expected_eps_query_bits = 115.2
-expected_eps_ood_bits = 231.5
-expected_eps_claim_batch_bits = 119.4
-expected_eps_sumcheck_bits = 246.4
-expected_eps_consistency_batch_bits = 117.0
-
-[[levels]]
-log_inv_rate = 10
-log_msg_cols = 10
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 27
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 10
-consistency_batch_grinding_bits = 12
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 209.5
-expected_eps_query_bits = 115.7
-expected_eps_ood_bits = 230.1
-expected_eps_claim_batch_bits = 118.4
-expected_eps_sumcheck_bits = 245.4
-expected_eps_consistency_batch_bits = 116.0
-
-[[levels]]
-log_inv_rate = 12
-log_msg_cols = 7
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 24
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 11
-consistency_batch_grinding_bits = 13
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 207.5
-expected_eps_query_bits = 115.5
-expected_eps_ood_bits = 228.8
-expected_eps_claim_batch_bits = 117.4
-expected_eps_sumcheck_bits = 244.4
-expected_eps_consistency_batch_bits = 115.0
-
-[[levels]]
-log_inv_rate = 14
-log_msg_cols = 4
-log_num_interleaved = 4
-k_recursive = 4
-regime = "johnson_ood"
-eta = 0.02
-queries = 22
-grinding_bits = 16
-fold_grinding_bits = 0
-claim_batch_grinding_bits = 12
-consistency_batch_grinding_bits = 14
-ood_samples = 2
-target_security_bits = 100
-expected_eps_pg_bits = 205.5
-expected_eps_query_bits = 113.7
-expected_eps_ood_bits = 227.7
-expected_eps_claim_batch_bits = 116.4
-expected_eps_sumcheck_bits = 243.4
-expected_eps_consistency_batch_bits = 114.0
-
-[final_block]
-yr_log_n = 4
diff --git a/crates/flock-core/src/pcs/commit.rs b/crates/flock-core/src/pcs/commit.rs
index 94f07f36..5dad9433 100644
--- a/crates/flock-core/src/pcs/commit.rs
+++ b/crates/flock-core/src/pcs/commit.rs
@@ -76,9 +76,7 @@ impl PcsParams {
     pub fn zerocheck_grinding(&self) -> crate::zerocheck::ZerocheckGrinding {
         match self.profile {
             crate::pcs::ligerito::LigeritoProfile::Fast
-            | crate::pcs::ligerito::LigeritoProfile::Fast128
             | crate::pcs::ligerito::LigeritoProfile::Slim
-            | crate::pcs::ligerito::LigeritoProfile::Slim128
             | crate::pcs::ligerito::LigeritoProfile::Secure => {
                 crate::zerocheck::ZerocheckGrinding::per_challenge_128()
             }
@@ -98,9 +96,7 @@ impl PcsParams {
     pub fn lincheck_grinding(&self) -> crate::lincheck::LincheckGrinding {
         match self.profile {
             crate::pcs::ligerito::LigeritoProfile::Fast
-            | crate::pcs::ligerito::LigeritoProfile::Fast128
             | crate::pcs::ligerito::LigeritoProfile::Slim
-            | crate::pcs::ligerito::LigeritoProfile::Slim128
             | crate::pcs::ligerito::LigeritoProfile::Secure => {
                 crate::lincheck::LincheckGrinding::per_challenge_128()
             }
@@ -115,9 +111,7 @@ impl PcsParams {
     pub fn element_grinding(&self) -> crate::element_r1cs::Grinding {
         match self.profile {
             crate::pcs::ligerito::LigeritoProfile::Fast
-            | crate::pcs::ligerito::LigeritoProfile::Fast128
             | crate::pcs::ligerito::LigeritoProfile::Slim
-            | crate::pcs::ligerito::LigeritoProfile::Slim128
             | crate::pcs::ligerito::LigeritoProfile::Secure => {
                 crate::element_r1cs::Grinding::per_challenge_128()
             }
@@ -137,9 +131,7 @@ impl PcsParams {
     pub fn opening_grinding(&self) -> crate::pcs::OpeningGrinding {
         match self.profile {
             crate::pcs::ligerito::LigeritoProfile::Fast
-            | crate::pcs::ligerito::LigeritoProfile::Fast128
             | crate::pcs::ligerito::LigeritoProfile::Slim
-            | crate::pcs::ligerito::LigeritoProfile::Slim128
             | crate::pcs::ligerito::LigeritoProfile::Secure => {
                 crate::pcs::OpeningGrinding::per_challenge_128()
             }
@@ -154,9 +146,7 @@ impl PcsParams {
     pub fn product_gkr_grinding(&self) -> crate::product_gkr::BatchedGrinding {
         match self.profile {
             crate::pcs::ligerito::LigeritoProfile::Fast
-            | crate::pcs::ligerito::LigeritoProfile::Fast128
             | crate::pcs::ligerito::LigeritoProfile::Slim
-            | crate::pcs::ligerito::LigeritoProfile::Slim128
             | crate::pcs::ligerito::LigeritoProfile::Secure => {
                 crate::product_gkr::BatchedGrinding::per_challenge_128()
             }
@@ -171,9 +161,7 @@ impl PcsParams {
     pub fn matrix_fold_grinding(&self) -> crate::matrix_fold::FoldGrinding {
         match self.profile {
             crate::pcs::ligerito::LigeritoProfile::Fast
-            | crate::pcs::ligerito::LigeritoProfile::Fast128
             | crate::pcs::ligerito::LigeritoProfile::Slim
-            | crate::pcs::ligerito::LigeritoProfile::Slim128
             | crate::pcs::ligerito::LigeritoProfile::Secure => {
                 crate::matrix_fold::FoldGrinding::per_challenge_128()
             }
diff --git a/crates/flock-core/src/pcs/ligerito.rs b/crates/flock-core/src/pcs/ligerito.rs
index 92fb6209..7580f1c4 100644
--- a/crates/flock-core/src/pcs/ligerito.rs
+++ b/crates/flock-core/src/pcs/ligerito.rs
@@ -58,55 +58,44 @@ pub(crate) mod extension;
 /// differ in regime/target, so the rate alone cannot key the config lookup.
 ///
 /// - `Fast`:   rate 1/2, Johnson list-decoding regime with two-point OOD
-///             binding. Its query component is 128-bit and its MCA/fold
-///             arithmetic is over F256. Default.
-/// - `Slim`:   rate 1/4, Johnson + OOD + 16-bit query grinding. Its combined
-///             query work factor is 128-bit and its MCA/fold arithmetic is
-///             over F256. Roughly half the proof, ~2x L0 encoding work.
+///             binding, the aggressive recursion ladder (rate +2/level) and
+///             16-bit query PoW at every level: the query term targets 112
+///             bits and the PoW supplies the rest, work-normalized to 128.
+///             MCA/fold arithmetic over F256. Default.
+/// - `Slim`:   rate 1/4, same Johnson + OOD accounting, aggressive ladder and
+///             16-bit query PoW as `Fast`. Roughly half the proof, ~2x L0
+///             encoding work.
 /// - `Secure`: rate 1/2, unique-decoding regime (list size 1, no OOD),
 ///             120-bit overall soundness. Largest proof, most conservative
 ///             analysis.
+///
+/// History (2026-08-27): the grind-free `Fast`/`Slim` with the +1/level
+/// ladder were deleted and the `Fast128`/`Slim128` twins took their names
+/// (Ron's call, bloat ledger §C). Proof-IO v22 marks the transcript move.
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
 pub enum LigeritoProfile {
+    /// The aggressive ladder climbs the rate +2 per level (vs +1), so the
+    /// same folds reach higher rates sooner and each tail level needs fewer
+    /// consistency queries; codewords still shrink per level because
+    /// `rate_gain` stays below the fold count. See
+    /// [`Self::derive_profile_ladder`].
     #[default]
     Fast,
-    /// `Fast` at the pre-list-decoding cost point: the SAME Johnson
-    /// accounting and transcript shape, but the consistency-query term
-    /// targets the profile's own 100 bits instead of the strict-128
-    /// override — reproducing the query schedule shipped before the
-    /// 128-bit milestone (m27 ladder [218, 106, 71, 53]). The variant for
-    /// deployments that keep the 100-bit recursion configuration while the
-    /// 128-bit one matures.
+    /// The 100-bit cost point kept for deployments on the chain100
+    /// configuration: rate 1/2, the shipped +1/level ladder, NO query PoW,
+    /// and the consistency-query term targets the profile's own 100 bits
+    /// (m27 ladder [218, 106, 71, 53]). Since the 2026-08-27 consolidation
+    /// it differs from `Fast` in ladder, PoW and target — it is a frozen
+    /// historical schedule, not "`Fast` with one knob changed".
     Fast100,
     Slim,
-    /// `Slim` at the pre-list-decoding cost point — the chain track's
-    /// envelope outers run slim, so the 100-bit chain variant needs this
-    /// twin exactly as the leaf track needs [`Self::Fast100`]. Same
-    /// analysis and 16-bit query-phase PoW; the query term targets the
-    /// profile's own 100 bits (m29 ladder total 262, the schedule the
-    /// envelope's fixed point was iterated against).
+    /// `Slim`'s 100-bit cost point — the chain100 track's envelope outers run
+    /// on it exactly as the leaf track runs on [`Self::Fast100`]. Rate 1/4,
+    /// the shipped +1/level ladder, 16-bit query PoW; the query term targets
+    /// the profile's own 100 bits (m29 ladder total 262, the schedule the
+    /// envelope's fixed point was iterated against). Frozen, like `Fast100`.
     Slim100,
-    /// `Slim` with an aggressive recursion ladder: the rate climbs +2 per
-    /// level (vs `Slim`'s +1), so the same folds reach higher rates sooner
-    /// and each tail level needs fewer consistency queries. Same 128-bit
-    /// Johnson accounting, rate 1/4 L0, two-point OOD and 16-bit query PoW as
-    /// `Slim` — only the per-level rate schedule changes. Nets ~10% smaller
-    /// proofs at equal security (the codewords still shrink per level because
-    /// `rate_gain` stays below the fold count). See
-    /// [`Self::derive_profile_ladder`].
-    Slim128,
-    /// `Fast` with the aggressive recursion ladder (rate +2/level), the
-    /// rate-1/2 twin of [`Self::Slim128`]. Same 128-bit Johnson accounting
-    /// and rate-1/2 L0 as `Fast`, but UNLIKE `Fast` it grinds 16 bits of
-    /// query PoW per level (since 2026-08-14; see the `query_grind` match in
-    /// the schedule derivation): the query term targets 112 bits and the
-    /// PoW supplies the rest, work-normalized. The deeper levels also carry
-    /// larger claim-batch / consistency-batch grinding. Nets ~11% smaller
-    /// proofs at equal 128-bit security, near-free on prove (codewords keep
-    /// shrinking since `rate_gain` < the fold count). See
-    /// [`Self::derive_profile_ladder`].
-    Fast128,
     Secure,
 }
 
@@ -114,8 +103,8 @@ impl LigeritoProfile {
     /// L0 code rate index for this profile (`rho_0 = 2^-log_inv_rate`).
     pub fn log_inv_rate(self) -> usize {
         match self {
-            Self::Fast | Self::Fast100 | Self::Fast128 | Self::Secure => 1,
-            Self::Slim | Self::Slim100 | Self::Slim128 => 2,
+            Self::Fast100 | Self::Fast | Self::Secure => 1,
+            Self::Slim100 | Self::Slim => 2,
         }
     }
     /// Historical profile-local target. Strict Fast/Slim configs retain the
@@ -125,12 +114,7 @@ impl LigeritoProfile {
     /// query floor.
     pub fn security_bits(self) -> usize {
         match self {
-            Self::Fast
-            | Self::Fast100
-            | Self::Fast128
-            | Self::Slim
-            | Self::Slim100
-            | Self::Slim128 => 100,
+            Self::Fast100 | Self::Fast | Self::Slim100 | Self::Slim => 100,
             Self::Secure => 120,
         }
     }
@@ -138,10 +122,8 @@ impl LigeritoProfile {
         match self {
             Self::Fast => "fast",
             Self::Fast100 => "fast100",
-            Self::Fast128 => "fast128",
             Self::Slim => "slim",
             Self::Slim100 => "slim100",
-            Self::Slim128 => "slim128",
             Self::Secure => "secure",
         }
     }
@@ -525,14 +507,10 @@ macro_rules! profile_configs {
                  include_str!(concat!("../../configs/ligerito/m", $m, "_fast.toml"))),
                 (($m, LigeritoProfile::Fast100),
                  include_str!(concat!("../../configs/ligerito/m", $m, "_fast100.toml"))),
-                (($m, LigeritoProfile::Fast128),
-                 include_str!(concat!("../../configs/ligerito/m", $m, "_fast128.toml"))),
                 (($m, LigeritoProfile::Slim),
                  include_str!(concat!("../../configs/ligerito/m", $m, "_slim.toml"))),
                 (($m, LigeritoProfile::Slim100),
                  include_str!(concat!("../../configs/ligerito/m", $m, "_slim100.toml"))),
-                (($m, LigeritoProfile::Slim128),
-                 include_str!(concat!("../../configs/ligerito/m", $m, "_slim128.toml"))),
                 (($m, LigeritoProfile::Secure),
                  include_str!(concat!("../../configs/ligerito/m", $m, "_secure.toml"))),
             )+
@@ -1253,10 +1231,7 @@ impl LigeritoSecurityConfig {
     fn validate_profile(&self, profile: LigeritoProfile) -> Result<(), String> {
         let expected = match profile {
             LigeritoProfile::Secure => "f256_split_no_row_union_over_ben_sasson_2025_cor_1_4",
-            LigeritoProfile::Fast
-            | LigeritoProfile::Fast128
-            | LigeritoProfile::Slim
-            | LigeritoProfile::Slim128 => {
+            LigeritoProfile::Fast | LigeritoProfile::Slim => {
                 "f256_split_johnson_two_point_ood_query128_c3_algebraic_row_union_over_bchks25_thm_4_6"
             }
             LigeritoProfile::Fast100 | LigeritoProfile::Slim100 => {
@@ -1764,11 +1739,12 @@ impl LigeritoSecurityConfig {
     ///             MCA arithmetic.
     /// - `Secure`: Udr, rate 1/2, ε* = 1e-3, 120 bits per round.
     pub fn derive_profile(m: usize, profile: LigeritoProfile) -> Result<Self, String> {
-        // Shipped ladder: 3 folds/level, +1 rate/level — except the *128
-        // profiles, whose whole point is the +2/level aggressive ladder (still
-        // < 3 folds, so codewords keep shrinking).
+        // Ladder: 3 folds/level. Strict Fast/Slim climb the rate +2 per level
+        // (the aggressive ladder they inherited from Fast128/Slim128 in the
+        // 2026-08-27 consolidation; still < 3 folds, so codewords keep
+        // shrinking). Fast100/Slim100/Secure keep the shipped +1/level.
         let rate_gain = match profile {
-            LigeritoProfile::Slim128 | LigeritoProfile::Fast128 => 2,
+            LigeritoProfile::Slim | LigeritoProfile::Fast => 2,
             _ => 1,
         };
         Self::derive_profile_ladder(m, profile, 3, rate_gain)
@@ -1792,23 +1768,18 @@ impl LigeritoSecurityConfig {
         let log_inv_rate = profile.log_inv_rate();
         // 16-bit query PoW: each level's grinding substitutes for 16 bits of
         // query soundness (strict_query_count subtracts it from the target),
-        // cutting Σq ~12% at the fast128 m32 leaf for ~2^16 hash trials per
+        // cutting Σq ~12% at the Fast m32 leaf for ~2^16 hash trials per
         // level natively. Slim has shipped this since its first schedule;
-        // Fast128 joined 2026-08-14 (Ron's call, the leanVM comparison — its
-        // Johnson configs grind 16 bits at every round). Plain Fast/Fast100
-        // stay grind-free: they are the fixed historical cost points.
+        // Fast joined 2026-08-14 as Fast128 (Ron's call, the leanVM
+        // comparison — its Johnson configs grind 16 bits at every round) and
+        // took the `Fast` name in the 2026-08-27 consolidation. Fast100 stays
+        // grind-free: it is the frozen historical cost point.
         let query_grind: usize = match profile {
-            LigeritoProfile::Slim
-            | LigeritoProfile::Slim100
-            | LigeritoProfile::Slim128
-            | LigeritoProfile::Fast128 => 16,
-            LigeritoProfile::Fast | LigeritoProfile::Fast100 | LigeritoProfile::Secure => 0,
+            LigeritoProfile::Slim100 | LigeritoProfile::Slim | LigeritoProfile::Fast => 16,
+            LigeritoProfile::Fast100 | LigeritoProfile::Secure => 0,
         };
         let query_target_bits = match profile {
-            LigeritoProfile::Fast
-            | LigeritoProfile::Fast128
-            | LigeritoProfile::Slim
-            | LigeritoProfile::Slim128 => LIST_DECODING_QUERY_TARGET_BITS,
+            LigeritoProfile::Fast | LigeritoProfile::Slim => LIST_DECODING_QUERY_TARGET_BITS,
             // Fast100 IS Fast at the pre-list-decoding cost point: the
             // query term targets the profile's own 100 bits, reproducing
             // the schedule shipped before the strict-128 milestone.
@@ -1829,30 +1800,27 @@ impl LigeritoSecurityConfig {
         // node proof grows ~60 KiB. initial_k 5 restores 2^17 columns
         // (rows ≈ 28-31 words). Soundness derives identically: Johnson
         // per-query bits depend on rate/η only, so per-level query counts
-        // are unchanged; the Fast ladder re-derives as cols 17/14/11/8
-        // (yr 5, Σq 629) and the Slim ladder as cols 17/14/11/8/5
-        // (yr 5, Σq 347). Secure keeps 6 (unused by the recursion track).
+        // are unchanged; at the 2026-08-27 consolidation the Fast ladder
+        // re-derives as rates 1/3/5/7/9 (Σq 435) and the Slim ladder as
+        // 2/4/6/8/10 (Σq 279). Secure keeps 6 (unused by the recursion
+        // track).
         // m28 joined 2026-08-05 when the transcript-v3 duplex pushed the
         // slim L1 recursion node under 2^21 words: initial_k = 4 keeps the
         // same 2^17 columns (cols = log_n − initial_k = 21 − 4).
         let initial_k = match (m, profile) {
             (
                 29,
-                LigeritoProfile::Fast
-                | LigeritoProfile::Fast100
-                | LigeritoProfile::Fast128
-                | LigeritoProfile::Slim
+                LigeritoProfile::Fast100
+                | LigeritoProfile::Fast
                 | LigeritoProfile::Slim100
-                | LigeritoProfile::Slim128,
+                | LigeritoProfile::Slim,
             ) => 5usize,
             (
                 28,
-                LigeritoProfile::Fast
-                | LigeritoProfile::Fast100
-                | LigeritoProfile::Fast128
-                | LigeritoProfile::Slim
+                LigeritoProfile::Fast100
+                | LigeritoProfile::Fast
                 | LigeritoProfile::Slim100
-                | LigeritoProfile::Slim128,
+                | LigeritoProfile::Slim,
             ) => 4usize,
             _ => 6usize,
         };
@@ -1864,12 +1832,10 @@ impl LigeritoSecurityConfig {
         let per_query_bits_feas = |rate: usize| -> f64 {
             match profile {
                 LigeritoProfile::Secure => udr_per_query_bits_asymptotic(rate),
-                LigeritoProfile::Fast
-                | LigeritoProfile::Fast100
-                | LigeritoProfile::Fast128
-                | LigeritoProfile::Slim
+                LigeritoProfile::Fast100
+                | LigeritoProfile::Fast
                 | LigeritoProfile::Slim100
-                | LigeritoProfile::Slim128 => paper_per_query_bits(rate, JOHNSON_ETA),
+                | LigeritoProfile::Slim => paper_per_query_bits(rate, JOHNSON_ETA),
             }
         };
 
@@ -1912,12 +1878,10 @@ impl LigeritoSecurityConfig {
             // UDR, length-agnostic Johnson otherwise.
             let per_q = match profile {
                 LigeritoProfile::Secure => udr_per_query_bits(rate, cols, UDR_PROXIMITY_LOSS),
-                LigeritoProfile::Fast
-                | LigeritoProfile::Fast100
-                | LigeritoProfile::Fast128
-                | LigeritoProfile::Slim
+                LigeritoProfile::Fast100
+                | LigeritoProfile::Fast
                 | LigeritoProfile::Slim100
-                | LigeritoProfile::Slim128 => paper_per_query_bits(rate, JOHNSON_ETA),
+                | LigeritoProfile::Slim => paper_per_query_bits(rate, JOHNSON_ETA),
             };
             let queries = strict_query_count(query_target_bits, query_grind, per_q);
             if queries > (1usize << (cols + rate)) {
@@ -1944,12 +1908,10 @@ impl LigeritoSecurityConfig {
                         None,
                     )
                 }
-                LigeritoProfile::Fast
-                | LigeritoProfile::Fast100
-                | LigeritoProfile::Fast128
-                | LigeritoProfile::Slim
+                LigeritoProfile::Fast100
+                | LigeritoProfile::Fast
                 | LigeritoProfile::Slim100
-                | LigeritoProfile::Slim128 => {
+                | LigeritoProfile::Slim => {
                     let eps_pg =
                         FOLD_FIELD_LOG_Q - paper_johnson_log_a(rate, JOHNSON_ETA, cols, ilv);
                     let mu = cols + ilv;
@@ -2017,10 +1979,7 @@ impl LigeritoSecurityConfig {
 
         let analysis_version = match profile {
             LigeritoProfile::Secure => "f256_split_no_row_union_over_ben_sasson_2025_cor_1_4",
-            LigeritoProfile::Fast
-            | LigeritoProfile::Fast128
-            | LigeritoProfile::Slim
-            | LigeritoProfile::Slim128 => {
+            LigeritoProfile::Fast | LigeritoProfile::Slim => {
                 "f256_split_johnson_two_point_ood_query128_c3_algebraic_row_union_over_bchks25_thm_4_6"
             }
             // Same analysis as Fast; only the query term's target differs
@@ -5685,8 +5644,9 @@ mod tests {
     }
 
     /// Both embedded TOMLs (m29_fast at rate 1/2 and m29_slim at rate 1/4)
-    /// parse, validate, and produce ProverConfig/VerifierConfig agreeing
-    /// with the corresponding `default_config(22, 6, rate)` shape.
+    /// parse, validate, and produce ProverConfig/VerifierConfig with the
+    /// aggressive +2/level ladder and the same fold shape as
+    /// `default_config(22, 5, rate)` (which climbs +1/level).
     #[test]
     fn ligerito_security_config_m29_toml_loads() {
         let toml_str = include_str!("../../configs/ligerito/m29_fast.toml");
@@ -5699,22 +5659,26 @@ mod tests {
         assert_eq!(cfg.initial_k, 5);
         assert_eq!(cfg.hash, "sha256");
         assert_eq!(cfg.levels.len(), 5);
-        // Fast = JohnsonOod profile: 279 L0 queries put the query term
-        // strictly below 2^-128 (no list union bound — single-codeword
-        // binding via the opening claim / OOD samples). The MCA/proximity
-        // algebraic terms are evaluated over F256.
+        // Fast = JohnsonOod profile with 16-bit query PoW at every level:
+        // 244 L0 queries put the raw query term at ~112 bits and the PoW
+        // supplies the rest, work-normalized above 2^-128 (no list union
+        // bound — single-codeword binding via the opening claim / OOD
+        // samples). The MCA/proximity algebraic terms are evaluated over
+        // F256. (The grind-free 279-query Fast was deleted 2026-08-27.)
         assert_eq!(cfg.levels[0].regime, SoundnessRegime::JohnsonOod);
-        assert_eq!(cfg.levels[0].queries, 279);
-        assert_eq!(cfg.levels[0].grinding_bits, 0);
+        assert_eq!(cfg.levels[0].queries, 244);
+        assert_eq!(cfg.levels[0].grinding_bits, 16);
+        assert!(cfg.levels.iter().all(|lv| lv.grinding_bits == 16));
         assert!(cfg.levels.iter().all(|lv| lv.fold_grinding_bits == 0));
         assert_eq!(cfg.field, "f256");
         assert_eq!(cfg.levels[0].ood_samples, 1); // plus L0's opening point
         assert!(cfg.levels.iter().skip(1).all(|lv| lv.ood_samples == 2));
         let (pv, _vc) = cfg.to_prover_verifier_configs().unwrap();
         let default = default_config(22, 5, 1).unwrap();
-        assert_eq!(pv.log_inv_rates, default.log_inv_rates);
+        // Aggressive ladder: +2 rate per level (default_config climbs +1).
+        assert_eq!(pv.log_inv_rates, vec![1, 3, 5, 7, 9]);
         assert_eq!(pv.recursive_ks, default.recursive_ks);
-        assert_eq!(pv.queries[0], 279);
+        assert_eq!(pv.queries[0], 244);
 
         // Slim mode: rates start at 1/4.
         let toml_str = include_str!("../../configs/ligerito/m29_slim.toml");
@@ -5728,7 +5692,7 @@ mod tests {
         assert_eq!(cfg_slim.initial_k, 5);
         let (pv_slim, _vc_slim) = cfg_slim.to_prover_verifier_configs().unwrap();
         let default_slim = default_config(22, 5, 2).unwrap();
-        assert_eq!(pv_slim.log_inv_rates, default_slim.log_inv_rates);
+        assert_eq!(pv_slim.log_inv_rates, vec![2, 4, 6, 8, 10]);
         assert_eq!(pv_slim.recursive_ks, default_slim.recursive_ks);
     }
 
@@ -5855,7 +5819,8 @@ mod tests {
         // recursion-node row-width choice); a stale batch-6 request is a
         // hard error, never a silent fallback.
         let pv = prover_config_for(22, 5, LigeritoProfile::Fast).expect("m29 fast must load");
-        assert_eq!(pv.queries[0], 279);
+        assert_eq!(pv.queries[0], 244);
+        assert_eq!(pv.grinding_bits[0], 16);
         assert!(pv.fold_grinding_bits.iter().all(|&bits| bits == 0));
         assert_eq!(embedded_initial_k(29, LigeritoProfile::Fast), Some(5));
         let err = prover_config_for(22, 6, LigeritoProfile::Fast).unwrap_err();
diff --git a/crates/flock-prover/examples/gen_ligerito_configs.rs b/crates/flock-prover/examples/gen_ligerito_configs.rs
index 3ea9745b..8743a771 100644
--- a/crates/flock-prover/examples/gen_ligerito_configs.rs
+++ b/crates/flock-prover/examples/gen_ligerito_configs.rs
@@ -21,12 +21,10 @@ use flock_prover::pcs::ligerito::{LigeritoProfile, LigeritoSecurityConfig};
 
 fn main() {
     let profiles = [
-        LigeritoProfile::Fast,
         LigeritoProfile::Fast100,
-        LigeritoProfile::Fast128,
-        LigeritoProfile::Slim,
+        LigeritoProfile::Fast,
         LigeritoProfile::Slim100,
-        LigeritoProfile::Slim128,
+        LigeritoProfile::Slim,
         LigeritoProfile::Secure,
     ];
     // Configs live in the flock-core crate (which embeds them via include_str!).
diff --git a/crates/flock-prover/src/merkle_path.rs b/crates/flock-prover/src/merkle_path.rs
index 89741d4d..bbd94d08 100644
--- a/crates/flock-prover/src/merkle_path.rs
+++ b/crates/flock-prover/src/merkle_path.rs
@@ -127,9 +127,7 @@ impl MerklePathGrinding {
     pub fn for_profile(profile: flock_core::pcs::ligerito::LigeritoProfile) -> Self {
         match profile {
             flock_core::pcs::ligerito::LigeritoProfile::Fast
-            | flock_core::pcs::ligerito::LigeritoProfile::Fast128
             | flock_core::pcs::ligerito::LigeritoProfile::Slim
-            | flock_core::pcs::ligerito::LigeritoProfile::Slim128
             | flock_core::pcs::ligerito::LigeritoProfile::Secure => Self::per_challenge_128(),
             flock_core::pcs::ligerito::LigeritoProfile::Fast100
             | flock_core::pcs::ligerito::LigeritoProfile::Slim100 => Self::disabled(),
diff --git a/crates/flock-prover/src/proof_io.rs b/crates/flock-prover/src/proof_io.rs
index ee1d38c2..404c3edd 100644
--- a/crates/flock-prover/src/proof_io.rs
+++ b/crates/flock-prover/src/proof_io.rs
@@ -8,7 +8,7 @@
 //! On-disk format:
 //! ```text
 //!   bytes 0..5    "FLOCK"                  (5-byte magic)
-//!   byte  5       VERSION                  (currently 21)
+//!   byte  5       VERSION                  (currently 22)
 //!   bytes 6..7    flavor: 2 = R1cs, 4 = Mixed
 //!                 (0/1 reserved: legacy BaseFold; 3 was the retired chain)
 //!   bytes 7..     bincode-serialized payload
@@ -137,7 +137,15 @@ const MAX_BUNDLE_BYTES: usize = 64 * 1024 * 1024;
 // proof — the standalone hash setups prove over the single-slot union
 // commit now (dense stack + integer lanes); the padded-commit
 // R1csProofLigerito payload is gone from this flavor.
-const VERSION: u8 = 21;
+// v22 (2026-08-27): the profile consolidation (bloat ledger §C). The
+// grind-free `fast`/`slim` (+1 rate/level ladder) were deleted and the
+// `fast128`/`slim128` schedules took their names: aggressive +2/level
+// ladder, 16-bit query PoW per level, larger deep-level batch grinding. No
+// payload field changed, but a v21 proof made under `fast`/`slim` carries a
+// different query/rate/PoW schedule than this build derives for those
+// names, so it cannot be interpreted safely. `fast100`/`slim100`/`secure`
+// are byte-for-byte unchanged.
+const VERSION: u8 = 22;
 
 /// Flavor discriminator (1 byte). Lets a generic reader peek what kind of
 /// bundle a file holds without parsing the payload first (see
diff --git a/crates/flock-prover/src/tower/config.rs b/crates/flock-prover/src/tower/config.rs
index ede80cbf..c7f05ff9 100644
--- a/crates/flock-prover/src/tower/config.rs
+++ b/crates/flock-prover/src/tower/config.rs
@@ -35,14 +35,14 @@ impl TowerConfig {
     pub fn leaf_profile(self) -> LigeritoProfile {
         match self {
             TowerConfig::Chain100 => LigeritoProfile::Fast100,
-            TowerConfig::Chain128 => LigeritoProfile::Fast128,
+            TowerConfig::Chain128 => LigeritoProfile::Fast,
         }
     }
     /// The recursion-path OUTER profile (rate 1/4, envelope-ON).
     pub fn outer_profile(self) -> LigeritoProfile {
         match self {
             TowerConfig::Chain100 => LigeritoProfile::Slim100,
-            TowerConfig::Chain128 => LigeritoProfile::Slim128,
+            TowerConfig::Chain128 => LigeritoProfile::Slim,
         }
     }
 }
diff --git a/crates/flock-prover/tests/transcript_shape.rs b/crates/flock-prover/tests/transcript_shape.rs
index cfb138f3..6d2506db 100644
--- a/crates/flock-prover/tests/transcript_shape.rs
+++ b/crates/flock-prover/tests/transcript_shape.rs
@@ -286,7 +286,12 @@ fn element_only_transcript_shape_is_pinned() {
     // moved each level's Pow bits. Measured: the digest at 700cace~1 was a
     // third value, neither the old nor the new pin. Two deterministic print
     // runs agreed.
-    const EXPECTED: &str = "e7a0b59f43903cf62f46ed0d58eeeec5ec5156cf5fc959f508a291ba2250ecd6";
+    // Re-pinned 2026-08-27 for the profile consolidation (proof-IO v22,
+    // bloat ledger §C): `Fast` now carries the former Fast128 schedule —
+    // aggressive +2/level ladder and 16-bit query PoW at every level — so
+    // the per-level query counts, caps and Pow bits all move. Two
+    // deterministic print runs agreed.
+    const EXPECTED: &str = "46b9b760ea72bcc0e549196bb31401e88993767d71636614de61270fd4cfdee3";
 
     let (_, shape) = record_element_only(12, &[3], &[1 << 12], 0xB0DD_1E01);
 
diff --git a/crates/flock-prover/tests/union_element.rs b/crates/flock-prover/tests/union_element.rs
index 8ed8cea4..8b875533 100644
--- a/crates/flock-prover/tests/union_element.rs
+++ b/crates/flock-prover/tests/union_element.rs
@@ -1317,6 +1317,11 @@ fn bundle_digest_merged(
 // mix-128-128 and mix-0-90 moved under both. The empty-instance fixture
 // elem-merged-nu12-0 held throughout. union_m6_fixtures was re-pinned with
 // 700cace but this file was missed. Two deterministic print runs agreed.
+// Re-pinned 2026-08-27 for the profile consolidation (proof-IO v22, bloat
+// ledger §C): `Fast` now carries the former Fast128 schedule (aggressive
+// +2/level ladder, 16-bit query PoW every level), so every fixture moved,
+// including the empty-instance one (the ladder itself changed, not just
+// the grinding). Two deterministic print runs agreed.
 // Runs by default since 2026-08-27: CI never passes `--ignored`, which is
 // how the 700cace sweep missed this pin. Same policy as `union_m6_fixtures`.
 #[test]
@@ -1325,39 +1330,39 @@ fn mixed_class_merged_proof_bytes_pinned() {
         (
             "elem-merged-nu12-full",
             1 << 12,
-            "affa7c153342f4fa0a02ee2b08367a0b0dc1885c175e9f09eef9b643ce421777",
+            "43e3c8b0de3a1fbd682ee1a07d78c4bdfce0de49a25fa237648eaef113f90532",
         ),
         (
             "elem-merged-nu12-2731",
             2731,
-            "a66cd908ede6e07bc4d48a80187a88bec41ca821598374e017966ff85a23a996",
+            "fc293680f649aecf034122cb391b1ff35e49240b494d261dde3f4ed35d1bd685",
         ),
         (
             "elem-merged-nu12-0",
             0,
-            "edc111d3a23eea1218973cc1a4382663684df8e066d54d9eef61e5b0613d9d81",
+            "ebb1dd96ef1a5a381f2b9f47f3d194d0505b39370f581c648a064ced08065a1b",
         ),
     ];
     const MIXED: [(&str, [usize; 2], &str); 4] = [
         (
             "mix-merged-nu7-128-128",
             [128, 128],
-            "f8a60a912f301b1094540cb163fb6cd547297bf869293c62fc989ff14adb1b05",
+            "1d0f6680e46c7254447cf2b2e37a6b7f06213d6a1fea17fcce9cd8f857a24ee7",
         ),
         (
             "mix-merged-nu7-100-90",
             [100, 90],
-            "cbf7812593e950e3a0185e7f0881352e6619538587477f61db1fb5d227c96f0b",
+            "84456fa03bd629fd217a21fda86b8d3527ea5819a6971988a6aa68bd119efca8",
         ),
         (
             "mix-merged-nu7-0-90",
             [0, 90],
-            "83f53efdb502655e3b956c6384d377d57641052639159cc21e79d553c2964c39",
+            "1e5a3c409edf63ded8fb863d74c090598725267e048a84646ebc2fa69cb99398",
         ),
         (
             "mix-merged-nu7-100-0",
             [100, 0],
-            "4516541821be3a8c7c29d60980e67b3c01d35f7788a70a1630b104d85c090f0b",
+            "bee4a92a2b0fec998aeae218a29608c1a0512d2e9dc7e161aff44950ed564b65",
         ),
     ];
 
diff --git a/crates/flock-prover/tests/union_m6_fixtures.rs b/crates/flock-prover/tests/union_m6_fixtures.rs
index 539e4c25..3e9c9b17 100644
--- a/crates/flock-prover/tests/union_m6_fixtures.rs
+++ b/crates/flock-prover/tests/union_m6_fixtures.rs
@@ -1,4 +1,4 @@
-//! Byte-identity anchors for the MERGED transport — currently proof-IO v21.
+//! Byte-identity anchors for the MERGED transport — currently proof-IO v22.
 //! An optimization must produce byte-identical proofs; only a
 //! deliberate protocol change may move these digests, and it must re-pin
 //! them with a history entry below.
@@ -82,6 +82,12 @@
 //! and the nu10 full-utilization fixture move (their levels' bits differ);
 //! the three small nu10 shapes hold (adjacent bits equal). Roundtrip
 //! suites green; digests stable across two print runs.
+//! Re-pinned 2026-08-27: the profile consolidation (proof-IO v22, bloat
+//! ledger §C). The grind-free `Fast`/`Slim` were deleted and `Fast` now
+//! carries the former Fast128 schedule: aggressive +2/level ladder and
+//! 16-bit query PoW at every level. All six digests move (every level's
+//! rate, query count, cap and PoW change). Full workspace suite green;
+//! digests stable across two print runs.
 
 use ::sha2 as sha2_hash;
 use flock_core::proof::{R1csClaim, R1csProofMergedLigerito};
@@ -198,22 +204,22 @@ fn m6_merged_union_proof_bytes_pinned() {
         (
             "merged-nu10-1024-1024",
             [1024, 1024],
-            "44e50df0ac2f4282e8a94e9ce1eb4ef094fda6d7556795c9ba174514b113d3cb",
+            "e50fcc617bc0e02cdb7592c8c702483864ae1f0acaf2b6239ae820ea6a054b04",
         ),
         (
             "merged-nu10-50-37",
             [50, 37],
-            "ed988c189e253a03568b69a208d0527034a75754fa6fbed87b8c17b05483391f",
+            "2e9fa4c9d476cb3453b6e01f2d68d22b43871d8691635acb8837dd896bc654c0",
         ),
         (
             "merged-nu10-8-8",
             [8, 8],
-            "a5a4c478c8e33fc05ceef8be011075f6618f73cc1e02cedeb18cc938b19acff8",
+            "388612533f9f425591168a6d560288a9c591879e37f7ace55c5636f6cd1c7251",
         ),
         (
             "merged-nu10-0-64",
             [0, 64],
-            "b34ac2ba4425e805cdc248c17a11ff7437d338493ad4b709933e84c55bcbc04b",
+            "6ea3899c9c235e0012297323d24d5440b8a704e9fbe12c793e0070d1210dced5",
         ),
     ];
 
@@ -289,7 +295,7 @@ fn m6_merged_union_proof_bytes_pinned() {
 fn m6_single_slot_merged_anchor_proof_bytes_pinned() {
     // BLAKE3, 256 blocks (m = 22).
     {
-        const EXPECTED: &str = "8bd3451eaf94fb8ad433c094bb4a1375f856565546b26fdf303d4a0b48a8325c";
+        const EXPECTED: &str = "b172c1f4665fdedc9d7af130531b3d182ebfaacff8b0323cd07860237f8a78fd";
         let n_blocks = 256usize;
         // The setup API IS the shipped single-slot union path since the
         // 2026-08-14 consolidation — the anchor pins it directly.
@@ -307,7 +313,7 @@ fn m6_single_slot_merged_anchor_proof_bytes_pinned() {
 
     // SHA-256, 128 blocks (m = 22).
     {
-        const EXPECTED: &str = "d4686311e9887d778c00b7e1b93ddddabb3bf10db74ca9bfdac75f8db55e0b80";
+        const EXPECTED: &str = "703cc4d574a3bd29629cbe98a149ddbb0c73f851bb0bd03ae402c7dcf73ca936";
         let n_blocks = 128usize;
         let setup = sha2::Sha256HybridSetup::new(n_blocks);
         let mut rng = Rng::new(0x4D36_5252);
diff --git a/docs/128-bit-grinding-audit.md b/docs/128-bit-grinding-audit.md
index b5854c77..beede61b 100644
--- a/docs/128-bit-grinding-audit.md
+++ b/docs/128-bit-grinding-audit.md
@@ -8,6 +8,19 @@
 > `chain_tower_e2e_with_lane` (`cargo test --release -p flock-prover --lib
 > tower:: -- --ignored`). Commands are kept verbatim as an audit record.
 
+> **Profile-consolidation note (2026-08-27, proof-IO v22):** the grind-free
+> `Fast`/`Slim` audited below were deleted; the `Fast128`/`Slim128`
+> schedules (audited under those names in the 08-13/08-14 passes: aggressive
+> +2/level ladder, 16-bit query PoW at every level, larger deep-level batch
+> grinding) now carry the `Fast`/`Slim` names. Where this document says
+> "Fast uses `lambda_query = 0`" or tabulates Fast `Q` at 279/136/91/…, it
+> describes the deleted profile; today's `Fast` grinds 16 bits per level
+> like Slim (query term ≥ 112 bits, work-normalized ≥ 128) and its ladder
+> rates are 1,3,5,7,9,11 rather than 1..6. `Fast100`/`Slim100` are
+> unchanged. The component floors (`validate()`) are profile-independent
+> and still hold; the per-profile derivation is in
+> `LigeritoSecurityConfig::derive_profile_ladder`.
+
 Status: implementation audit and independent re-review of the current
 `min/recursion-128bit` working tree. The non-Ligerito audit was completed on
 2026-08-11; Ligerito two-point OOD binding, the Flock paper's Appendix C.3
diff --git a/docs/bloat-ledger.md b/docs/bloat-ledger.md
index 23e357e0..bc19bded 100644
--- a/docs/bloat-ledger.md
+++ b/docs/bloat-ledger.md
@@ -268,7 +268,16 @@ GPU roundtrip alone.
 
 **Directed (Ron, 2026-08-27): consolidate the profile matrix — delete the
 grind-free `Fast` and `Slim` bases and keep the `*128` schedules as THE
-strict profiles.**
+strict profiles.** **EXECUTED 2026-08-27** (branch `bloat-phase2-profiles`):
+`Fast128`/`Slim128` renamed to `Fast`/`Slim`, the grind-free variants and
+their 28 TOMLs deleted (98 → 70 embedded configs); `gen_ligerito_configs`
+regenerates the renamed set byte-identically, so the derivation and the
+embedded files agree. Proof-IO v22. Re-pinned (two deterministic print runs
+each): `union_m6_fixtures` (6), `union_element` (7), `transcript_shape` (1).
+Tower pins hold — `Chain128` already ran on the `*128` twins. The CUDA
+host-only ladder replay (`make ligerito_f256_host`, m22 fast) matches the
+F256 driver on every proof field; the Blackwell GPU run needs the runner
+back. `Fast100`/`Slim100` unchanged (frozen historical schedules).
 
 *Premise correction (PR #37 review).* An earlier draft of this item said the
 `*128` twins "differ from their bases only in the per-level rate ladder".
diff --git a/docs/bloat-reduction-plan.md b/docs/bloat-reduction-plan.md
index b2a4c9bc..9cfc5cd1 100644
--- a/docs/bloat-reduction-plan.md
+++ b/docs/bloat-reduction-plan.md
@@ -69,6 +69,9 @@ Batched commits; full suite + byte pins after each batch (the pins are what
 make pruning safe here — a deletion that changes behavior fails loudly).
 
 **Phase 2 — decommission decisions** (Ron's calls, then 1–2 sessions each):
+0. **Profile consolidation — EXECUTED 2026-08-27** (ledger §C): the
+   grind-free `Fast`/`Slim` are gone, `Fast128`/`Slim128` took their names,
+   `Fast100`/`Slim100` frozen; 98 → 70 embedded TOMLs; proof-IO v22.
 1. **keccak3** — retirement was declined 2026-08-15; does the reason hold?
 2. **Merkle-path shift product** — still a product, or a leftover now that
    the tower verifies Merkle in-circuit? Retiring ≈ 6k lines + removes a
diff --git a/docs/recursion-100-128-variants.md b/docs/recursion-100-128-variants.md
index c36c8aec..1b9e330c 100644
--- a/docs/recursion-100-128-variants.md
+++ b/docs/recursion-100-128-variants.md
@@ -26,6 +26,17 @@ against your unmodified tip, none introduced by our commits.
 
 ## The variants
 
+> **Consolidation note (2026-08-27, bloat ledger §C, proof-IO v22):** the
+> grind-free `Fast`/`Slim` with the +1/level ladder were deleted and the
+> `Fast128`/`Slim128` schedules took their names. Strict `Fast`/`Slim` now
+> mean: aggressive ladder (rate +2/level), 16-bit query PoW at every level
+> (query term 112 bits + PoW, work-normalized to 128), larger deep-level
+> batch grinding. `Fast100`/`Slim100` are unchanged and frozen at their
+> historical schedules, so they now differ from the strict profiles in
+> ladder, PoW and target — the "only the query target differs" statements
+> below describe the pre-consolidation code and are kept as the record of
+> how the 100-bit variants were derived.
+
 | | 100-bit | 128-bit |
 | --- | --- | --- |
 | leaf/node track (mvp) | `TOWER_PROFILE=fast100` | default `TOWER_PROFILE=fast` |
@@ -46,8 +57,9 @@ instead of `LIST_DECODING_QUERY_TARGET_BITS`. The Johnson query floor in
 `LigeritoSecurityConfig::validate` is keyed off `analysis_version`
 (`query128` vs `query100`), so each config family validates against its own
 target; a boundary test pins the `Fast100` floor and the schedule equality.
-Both variants live in one binary. Proof format v20 (head is v21 as of
-2026-08-14, `6988b62` — the union-only batch consolidation) additionally makes the
+Both variants live in one binary. Proof format v20 (head is v22 as of
+2026-08-27 — the profile consolidation; v21 on 2026-08-14, `6988b62`, was the
+union-only batch consolidation) additionally makes the
 non-Ligerito policy distinction explicit: strict `Fast`/`Slim` enable all
 algebraic grinding families, whereas `Fast100`/`Slim100` intentionally keep
 those families disabled. Their public Ligerito query schedules also remain