diff --git a/rocket/src/main/scala/consts.scala b/rocket/src/main/scala/consts.scala
index 44bfae10..0cac1b92 100644
--- a/rocket/src/main/scala/consts.scala
+++ b/rocket/src/main/scala/consts.scala
@@ -10,6 +10,8 @@ object Constants
   val HAVE_FPU = true
   val HAVE_VEC = true
 
+  val MAX_THREADS = hwacha.Constants.NUM_PVFB * hwacha.Constants.WIDTH_PVFB / hwacha.Constants.SZ_BANK
+
   val MEM_BACKUP_WIDTH = 16
 
   val BR_X    = Bits("b????", 4)
diff --git a/rocket/src/main/scala/dpath_vec.scala b/rocket/src/main/scala/dpath_vec.scala
index 52f72618..3c2c60c7 100644
--- a/rocket/src/main/scala/dpath_vec.scala
+++ b/rocket/src/main/scala/dpath_vec.scala
@@ -46,7 +46,9 @@ class rocketDpathVec extends Component
   val nfregs = Mux(nfregs_stage(5), Bits(32), nfregs_stage) + UFix(0,7)
   val nregs = nxregs + nfregs
 
-  val uts_per_bank = MuxLookup(
+  //val uts_per_bank = UFix(4,9)
+
+  val nreg_mod_bank = MuxLookup(
     nregs, UFix(4,9), Array(
       UFix(0,7) -> UFix(256,9),
       UFix(1,7) -> UFix(256,9),
@@ -103,6 +105,9 @@ class rocketDpathVec extends Component
       UFix(52,7) -> UFix(5,9)
     ))
 
+  val uts_per_bank = Mux(nreg_mod_bank > UFix(MAX_THREADS,9), UFix(MAX_THREADS, 9), nreg_mod_bank)
+
+
   val reg_hwvl = Reg(resetVal = UFix(32, 12))
   val reg_appvl0 = Reg(resetVal = Bool(true))
   val hwvl_vcfg = (uts_per_bank * io.vecbankcnt)(11,0)
diff --git a/rocket/src/main/scala/top.scala b/rocket/src/main/scala/top.scala
index 55bf08f9..55f16e62 100644
--- a/rocket/src/main/scala/top.scala
+++ b/rocket/src/main/scala/top.scala
@@ -81,7 +81,29 @@ class Top extends Component
 }
 
 object top_main {
-  def main(args: Array[String]): Unit = {
-     chiselMain(args.drop(1), () => Class.forName(args(0)).newInstance.asInstanceOf[Component])
+  def main(args: Array[String]): Unit = { 
+    val design_args = args.slice(5, 10)
+    var i = 0
+    while (i < design_args.length) {
+      val arg = design_args(i)
+      arg match {
+        case "--NUM_PVFB" => {
+          hwacha.Constants.NUM_PVFB = design_args(i+1).toInt
+          i += 1
+        }
+        case "--WIDTH_PVFB" => {
+          hwacha.Constants.WIDTH_PVFB = design_args(i+1).toInt
+          hwacha.Constants.DEPTH_PVFB = design_args(i+1).toInt
+          i += 1
+        }
+        case "--CG" => {
+          hwacha.Constants.coarseGrained = true
+        }
+        case any => println("UNKNOWN: " + arg)
+      }
+      println(arg)
+      i += 1
+    }
+    chiselMain(args.slice(1,5), () => Class.forName(args(0)).newInstance.asInstanceOf[Component])
   }
 }