diff --git a/driver/level2/tbmv_L.c b/driver/level2/tbmv_L.c
index e40e79396..03aa22f2f 100644
--- a/driver/level2/tbmv_L.c
+++ b/driver/level2/tbmv_L.c
@@ -40,7 +40,7 @@
 #include <ctype.h>
 #include "common.h"
 
-const static FLOAT dp1 = 1.;
+// const static FLOAT dp1 = 1.;
 
 int CNAME(BLASLONG n, BLASLONG k, FLOAT *a, BLASLONG lda, FLOAT *b, BLASLONG incb, void *buffer){
 
diff --git a/driver/level2/tbmv_U.c b/driver/level2/tbmv_U.c
index 529fd863f..2fdf120d1 100644
--- a/driver/level2/tbmv_U.c
+++ b/driver/level2/tbmv_U.c
@@ -40,7 +40,7 @@
 #include <ctype.h>
 #include "common.h"
 
-const static FLOAT dp1 = 1.;
+// const static FLOAT dp1 = 1.;
 
 int CNAME(BLASLONG n, BLASLONG k, FLOAT *a, BLASLONG lda, FLOAT *b, BLASLONG incb, void *buffer){
 
diff --git a/driver/level2/tbsv_L.c b/driver/level2/tbsv_L.c
index f62400b5e..db8782ac0 100644
--- a/driver/level2/tbsv_L.c
+++ b/driver/level2/tbsv_L.c
@@ -40,7 +40,7 @@
 #include <ctype.h>
 #include "common.h"
 
-const static FLOAT dp1 = 1.;
+// const static FLOAT dp1 = 1.;
 
 int CNAME(BLASLONG n, BLASLONG k, FLOAT *a, BLASLONG lda, FLOAT *b, BLASLONG incb, void *buffer){
 
diff --git a/driver/level2/tbsv_U.c b/driver/level2/tbsv_U.c
index 1dc7f2006..1d5a6c42d 100644
--- a/driver/level2/tbsv_U.c
+++ b/driver/level2/tbsv_U.c
@@ -40,7 +40,7 @@
 #include <ctype.h>
 #include "common.h"
 
-const static FLOAT dp1 = 1.;
+// const static FLOAT dp1 = 1.;
 
 int CNAME(BLASLONG n, BLASLONG k, FLOAT *a, BLASLONG lda, FLOAT *b, BLASLONG incb, void *buffer){
 
diff --git a/driver/level2/tpmv_L.c b/driver/level2/tpmv_L.c
index d01478c66..89618077b 100644
--- a/driver/level2/tpmv_L.c
+++ b/driver/level2/tpmv_L.c
@@ -40,7 +40,7 @@
 #include <ctype.h>
 #include "common.h"
 
-const static FLOAT dp1 = 1.;
+// const static FLOAT dp1 = 1.;
 
 int CNAME(BLASLONG m, FLOAT *a, FLOAT *b, BLASLONG incb, void *buffer){
 
diff --git a/driver/level2/tpmv_U.c b/driver/level2/tpmv_U.c
index 5d311f8bd..4f21c5318 100644
--- a/driver/level2/tpmv_U.c
+++ b/driver/level2/tpmv_U.c
@@ -40,7 +40,7 @@
 #include <ctype.h>
 #include "common.h"
 
-const static FLOAT dp1 = 1.;
+// const static FLOAT dp1 = 1.;
 
 int CNAME(BLASLONG m, FLOAT *a, FLOAT *b, BLASLONG incb, void *buffer){
 
diff --git a/driver/level2/ztbmv_L.c b/driver/level2/ztbmv_L.c
index e7bd35796..f50ba8141 100644
--- a/driver/level2/ztbmv_L.c
+++ b/driver/level2/ztbmv_L.c
@@ -40,7 +40,7 @@
 #include <ctype.h>
 #include "common.h"
 
-const static FLOAT dp1 = 1.;
+// const static FLOAT dp1 = 1.;
 
 int CNAME(BLASLONG n, BLASLONG k, FLOAT *a, BLASLONG lda, FLOAT *b, BLASLONG incb, void *buffer){
 
diff --git a/driver/level2/ztbmv_U.c b/driver/level2/ztbmv_U.c
index c2d810a04..85d95d474 100644
--- a/driver/level2/ztbmv_U.c
+++ b/driver/level2/ztbmv_U.c
@@ -40,7 +40,7 @@
 #include <ctype.h>
 #include "common.h"
 
-const static FLOAT dp1 = 1.;
+// const static FLOAT dp1 = 1.;
 
 int CNAME(BLASLONG n, BLASLONG k, FLOAT *a, BLASLONG lda, FLOAT *b, BLASLONG incb, void *buffer){
 
diff --git a/driver/level2/ztbsv_L.c b/driver/level2/ztbsv_L.c
index 44329f5c7..e7394cef4 100644
--- a/driver/level2/ztbsv_L.c
+++ b/driver/level2/ztbsv_L.c
@@ -40,7 +40,7 @@
 #include <ctype.h>
 #include "common.h"
 
-const static FLOAT dp1 = 1.;
+// const static FLOAT dp1 = 1.;
 
 int CNAME(BLASLONG n, BLASLONG k, FLOAT *a, BLASLONG lda, FLOAT *b, BLASLONG incb, void *buffer){
 
diff --git a/driver/level2/ztbsv_U.c b/driver/level2/ztbsv_U.c
index 530194aa3..0b374159f 100644
--- a/driver/level2/ztbsv_U.c
+++ b/driver/level2/ztbsv_U.c
@@ -40,7 +40,7 @@
 #include <ctype.h>
 #include "common.h"
 
-const static FLOAT dp1 = 1.;
+// const static FLOAT dp1 = 1.;
 
 int CNAME(BLASLONG n, BLASLONG k, FLOAT *a, BLASLONG lda, FLOAT *b, BLASLONG incb, void *buffer){
 
diff --git a/driver/level2/ztpsv_L.c b/driver/level2/ztpsv_L.c
index 5ce07f43b..2c5bdd756 100644
--- a/driver/level2/ztpsv_L.c
+++ b/driver/level2/ztpsv_L.c
@@ -40,7 +40,7 @@
 #include <ctype.h>
 #include "common.h"
 
-const static FLOAT dm1 = -1.;
+// const static FLOAT dm1 = -1.;
 
 int CNAME(BLASLONG m, FLOAT *a, FLOAT *b, BLASLONG incb, void *buffer){
 
diff --git a/driver/level3/level3_gemm3m_thread.c b/driver/level3/level3_gemm3m_thread.c
index 340066625..bfd991ffb 100644
--- a/driver/level3/level3_gemm3m_thread.c
+++ b/driver/level3/level3_gemm3m_thread.c
@@ -974,7 +974,7 @@ static int gemm_driver(blas_arg_t *args, BLASLONG *range_m, BLASLONG
 int CNAME(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, FLOAT *sa, FLOAT *sb, BLASLONG mypos){
 
   BLASLONG m = args -> m;
-  BLASLONG n = args -> n;
+  // BLASLONG n = args -> n;
   BLASLONG nthreads = args -> nthreads;
   BLASLONG divN, divT;
   int mode;
@@ -985,13 +985,14 @@ int CNAME(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, FLOAT *sa, FLO
 
     m = m_to - m_from;
   }
-
+/*
   if (range_n) {
     BLASLONG n_from = *(((BLASLONG *)range_n) + 0);
     BLASLONG n_to   = *(((BLASLONG *)range_n) + 1);
 
     n = n_to - n_from;
   }
+*/
 
   if ((args -> m < nthreads * SWITCH_RATIO) || (args -> n < nthreads * SWITCH_RATIO)) {
     GEMM3M_LOCAL(args, range_m, range_n, sa, sb, 0);
diff --git a/kernel/generic/gemm_tcopy_8.c b/kernel/generic/gemm_tcopy_8.c
index 9770d110d..b28f3d219 100644
--- a/kernel/generic/gemm_tcopy_8.c
+++ b/kernel/generic/gemm_tcopy_8.c
@@ -719,10 +719,10 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, FLOAT *b){
 
   if (m & 1){
     aoffset1  = aoffset;
-    aoffset += lda;
+    // aoffset += lda;
 
     boffset1  = boffset;
-    boffset  += 8;
+    // boffset  += 8;
 
     i = (n >> 3);
     if (i > 0){
@@ -762,7 +762,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, FLOAT *b){
        *(boffset2 +  1) = ctemp02;
        *(boffset2 +  2) = ctemp03;
        *(boffset2 +  3) = ctemp04;
-       boffset2 += 4;
+       // boffset2 += 4;
      }
 
      if (n & 2){
@@ -772,7 +772,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, FLOAT *b){
 
        *(boffset3 +  0) = ctemp01;
        *(boffset3 +  1) = ctemp02;
-       boffset3 += 2;
+       // boffset3 += 2;
      }
 
      if (n & 1){
diff --git a/kernel/generic/trmm_lncopy_2.c b/kernel/generic/trmm_lncopy_2.c
index ed28b661b..616ae2508 100644
--- a/kernel/generic/trmm_lncopy_2.c
+++ b/kernel/generic/trmm_lncopy_2.c
@@ -121,12 +121,12 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	  b[ 0] = data01;
 	  b[ 1] = data03;
 
-	  ao1 += 1;
-	  ao2 += 1;
+	  /* ao1 += 1;
+	  ao2 += 1; */
 	  b += 2;
 	} else
 	  if (X < posY) {
-	    ao1 += lda;
+	    // ao1 += lda;
 	    b += 2;
 	  } else {
 #ifdef UNIT
@@ -141,8 +141,8 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	    b[ 0] = data01;
 	    b[ 1] = data03;
 #endif
-	    ao1 += 1;
-	    ao2 += 1;
+	    /* ao1 += 1;
+	    ao2 += 1; */
 	    b += 2;
 	  }
       }
@@ -191,7 +191,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	} while (i > 0);
       }
 
-      posY += 1;
+      // posY += 1;
   }
 
   return 0;
diff --git a/kernel/generic/trmm_lncopy_4.c b/kernel/generic/trmm_lncopy_4.c
index 0dcfb965a..25632d242 100644
--- a/kernel/generic/trmm_lncopy_4.c
+++ b/kernel/generic/trmm_lncopy_4.c
@@ -237,24 +237,24 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	    b[ 2] = data03;
 	    b[ 3] = data04;
 
-	    ao1 += 1;
+	    /* ao1 += 1;
 	    ao2 += 1;
 	    ao3 += 1;
-	    ao4 += 1;
+	    ao4 += 1; */
 	    b += 4;
 	  }
 
 	} else
 	  if (X < posY) {
 	    if (m & 2) {
-	      ao1 += 2 * lda;
-	      ao2 += 2 * lda;
+	      /* ao1 += 2 * lda;
+	      ao2 += 2 * lda; */
 
 	      b += 8;
 	    }
 
 	    if (m & 1) {
-	      ao1 += lda;
+	      // ao1 += lda;
 	      b += 4;
 	    }
 
@@ -414,12 +414,12 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	  b[ 0] = data01;
 	  b[ 1] = data02;
 
-	  ao1 += 1;
-	  ao2 += 1;
+	  /* ao1 += 1;
+	  ao2 += 1; */
 	  b += 2;
 	} else
 	  if (X < posY) {
-	    ao1 += lda;
+	    // ao1 += lda;
 	    b += 2;
 	  } else {
 #ifdef UNIT
@@ -477,7 +477,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	} while (i > 0);
       }
 
-      posY += 1;
+      // posY += 1;
   }
 
   return 0;
diff --git a/kernel/generic/trmm_lncopy_8.c b/kernel/generic/trmm_lncopy_8.c
index 8f5fbce87..69429411e 100644
--- a/kernel/generic/trmm_lncopy_8.c
+++ b/kernel/generic/trmm_lncopy_8.c
@@ -608,16 +608,16 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	} else
 	  if (X < posY) {
 	    if (m & 4) {
-	      ao1 += 4 * lda;
+	      /* ao1 += 4 * lda;
 	      ao2 += 4 * lda;
 	      ao3 += 4 * lda;
-	      ao4 += 4 * lda;
+	      ao4 += 4 * lda; */
 
 	      b += 32;
 	    }
 
 	    if (m & 2) {
-	      ao1 += 2 * lda;
+	      // ao1 += 2 * lda;
 	      b += 16;
 	    }
 
@@ -1018,7 +1018,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	} else
 	  if (X < posY) {
 	    if (m & 2) {
-	      ao1 += 2 * lda;
+	      // ao1 += 2 * lda;
 	      b += 8;
 	    }
 
diff --git a/kernel/generic/trmm_ltcopy_2.c b/kernel/generic/trmm_ltcopy_2.c
index e9ad45fa0..13a3bc53c 100644
--- a/kernel/generic/trmm_ltcopy_2.c
+++ b/kernel/generic/trmm_ltcopy_2.c
@@ -116,8 +116,8 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
       if (m & 1) {
 
 	if (X > posY) {
-	  ao1 += 1;
-	  ao2 += 1;
+	  /* ao1 += 1;
+	  ao2 += 1; */
 	  b += 2;
 	} else
 	  if (X < posY) {
@@ -126,7 +126,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 
 	    b[ 0] = data01;
 	    b[ 1] = data02;
-	    ao1 += lda;
+	    // ao1 += lda;
 	    b += 2;
 	  } else {
 #ifdef UNIT
@@ -141,7 +141,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	    b[ 0] = data01;
 	    b[ 1] = data02;
 #endif
-	    ao1 += 2;
+	    // ao1 += 2;
 	    b += 2;
 	  }
       }
@@ -190,7 +190,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	} while (i > 0);
       }
 
-      posY += 1;
+      // posY += 1;
   }
 
   return 0;
diff --git a/kernel/generic/trmm_ltcopy_4.c b/kernel/generic/trmm_ltcopy_4.c
index 66a7325bb..128536aad 100644
--- a/kernel/generic/trmm_ltcopy_4.c
+++ b/kernel/generic/trmm_ltcopy_4.c
@@ -204,18 +204,18 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	if (X > posY) {
 
 	  if (m & 2) {
-	    ao1 += 2;
+	    /* ao1 += 2;
 	    ao2 += 2;
 	    ao3 += 2;
-	    ao4 += 2;
+	    ao4 += 2; */
 	    b += 8;
 	  }
 
 	  if (m & 1) {
-	    ao1 += 1;
+	    /* ao1 += 1;
 	    ao2 += 1;
 	    ao3 += 1;
-	    ao4 += 1;
+	    ao4 += 1; */
 	    b += 4;
 	  }
 
@@ -241,7 +241,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	      b[ 7] = data08;
 
 	      ao1 += 2 * lda;
-	      ao2 += 2 * lda;
+	      // ao2 += 2 * lda;
 
 	      b += 8;
 	    }
@@ -257,7 +257,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	      b[ 2] = data03;
 	      b[ 3] = data04;
 
-	      ao1 += lda;
+	      // ao1 += lda;
 	      b += 4;
 	    }
 
@@ -412,8 +412,8 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
       if (i) {
 
 	if (X > posY) {
-	  ao1 += 1;
-	  ao2 += 1;
+	  /* ao1 += 1;
+	  ao2 += 1; */
 
 	  b += 2;
 	} else
@@ -423,7 +423,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 
 	    b[ 0] = data01;
 	    b[ 1] = data02;
-	    ao1 += lda;
+	    // ao1 += lda;
 	    b += 2;
 	  } else {
 #ifdef UNIT
@@ -481,7 +481,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	} while (i > 0);
       }
 
-      posY += 1;
+      // posY += 1;
   }
 
   return 0;
diff --git a/kernel/generic/trmm_ltcopy_8.c b/kernel/generic/trmm_ltcopy_8.c
index 101272829..71597d4e5 100644
--- a/kernel/generic/trmm_ltcopy_8.c
+++ b/kernel/generic/trmm_ltcopy_8.c
@@ -443,27 +443,27 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	if (X > posY) {
 
 	  if (m & 4) {
-	    ao1 += 4;
+	    /* ao1 += 4;
 	    ao2 += 4;
 	    ao3 += 4;
 	    ao4 += 4;
 	    ao5 += 4;
 	    ao6 += 4;
 	    ao7 += 4;
-	    ao8 += 4;
+	    ao8 += 4; */
 
 	  b += 32;
 	  }
 
 	  if (m & 2) {
-	    ao1 += 2;
+	    /* ao1 += 2;
 	    ao2 += 2;
 	    ao3 += 2;
 	    ao4 += 2;
 	    ao5 += 2;
 	    ao6 += 2;
 	    ao7 += 2;
-	    ao8 += 2;
+	    ao8 += 2; */
 
 	    b += 16;
 	  }
@@ -548,8 +548,8 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 
 	      ao1 += 4 * lda;
 	      ao2 += 4 * lda;
-	      ao3 += 4 * lda;
-	      ao4 += 4 * lda;
+	      /* ao3 += 4 * lda;
+	      ao4 += 4 * lda; */
 
 	      b += 32;
 	    }
@@ -964,10 +964,10 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	if (X > posY) {
 
 	  if (m & 2) {
-	    ao1 += 2;
+	    /* ao1 += 2;
 	    ao2 += 2;
 	    ao3 += 2;
-	    ao4 += 2;
+	    ao4 += 2; */
 
 	    b += 8;
 	  }
diff --git a/kernel/generic/trmm_uncopy_2.c b/kernel/generic/trmm_uncopy_2.c
index 61303a2ba..d4f107d66 100644
--- a/kernel/generic/trmm_uncopy_2.c
+++ b/kernel/generic/trmm_uncopy_2.c
@@ -122,12 +122,12 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	  b[ 0] = data01;
 	  b[ 1] = data03;
 
-	  ao1 += 1;
-	  ao2 += 1;
+	  /* ao1 += 1;
+	  ao2 += 1; */
 	  b += 2;
 	} else
 	  if (X > posY) {
-	    ao1 += lda;
+	    // ao1 += lda;
 	    b += 2;
 	  } else {
 #ifdef UNIT
@@ -142,7 +142,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	    b[ 0] = data01;
 	    b[ 1] = data03;
 #endif
-	    ao1 += lda;
+	    // ao1 += lda;
 	    b += 2;
 	  }
       }
diff --git a/kernel/generic/trmm_uncopy_4.c b/kernel/generic/trmm_uncopy_4.c
index 0218a0e31..9ec040d5d 100644
--- a/kernel/generic/trmm_uncopy_4.c
+++ b/kernel/generic/trmm_uncopy_4.c
@@ -241,23 +241,23 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	    b[ 2] = data05;
 	    b[ 3] = data07;
 
-	    ao1 += 1;
+	    /* ao1 += 1;
 	    ao2 += 1;
 	    ao3 += 1;
-	    ao4 += 1;
+	    ao4 += 1; */
 	    b += 4;
 	  }
 
 	} else
 	  if (X > posY) {
 	    if (m & 2) {
-	      ao1 += 2 * lda;
-	      ao2 += 2 * lda;
+	      /* ao1 += 2 * lda;
+	      ao2 += 2 * lda; */
 	      b   += 8;
 	    }
 
 	    if (m & 1) {
-	      ao1 += lda;
+	      // ao1 += lda;
 	      b += 4;
 	    }
 
@@ -418,13 +418,13 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 
 	  b[ 0] = data01;
 	  b[ 1] = data05;
-	  ao1 += 1;
-	  ao2 += 1;
+	  /* ao1 += 1;
+	  ao2 += 1; */
 	  b += 2;
 	} else
 	  if (X > posY) {
-	    ao1 += lda;
-	    ao2 += lda;
+	    /* ao1 += lda;
+	    ao2 += lda; */
 	    b += 2;
 	  } else {
 #ifdef UNIT
@@ -438,8 +438,8 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	    b[ 0] = data01;
 	    b[ 1] = data05;
 #endif
-	    ao1 += lda;
-	    ao2 += lda;
+	    /* ao1 += lda;
+	    ao2 += lda; */
 	    b += 2;
 	  }
       }
diff --git a/kernel/generic/trmm_uncopy_8.c b/kernel/generic/trmm_uncopy_8.c
index ecfefd041..d54dae996 100644
--- a/kernel/generic/trmm_uncopy_8.c
+++ b/kernel/generic/trmm_uncopy_8.c
@@ -610,16 +610,16 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	} else
 	  if (X > posY) {
 	    if (m & 4) {
-	      ao1 += 4 * lda;
+	      /* ao1 += 4 * lda;
 	      ao2 += 4 * lda;
 	      ao3 += 4 * lda;
-	      ao4 += 4 * lda;
+	      ao4 += 4 * lda; */
 
 	      b += 32;
 	    }
 
 	    if (m & 2) {
-	      ao1 += 2 * lda;
+	      // ao1 += 2 * lda;
 	      b += 16;
 	    }
 
@@ -1019,7 +1019,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	} else
 	  if (X > posY) {
 	    if (m & 2) {
-	      ao1 += 2 * lda;
+	      // ao1 += 2 * lda;
 	      b += 8;
 	    }
 
diff --git a/kernel/generic/trmm_utcopy_2.c b/kernel/generic/trmm_utcopy_2.c
index ae4a19e32..efa68162c 100644
--- a/kernel/generic/trmm_utcopy_2.c
+++ b/kernel/generic/trmm_utcopy_2.c
@@ -117,8 +117,8 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
       if (m & 1) {
 
 	if (X < posY) {
-	  ao1 += 1;
-	  ao2 += 1;
+	  /* ao1 += 1;
+	  ao2 += 1; */
 	  b += 2;
 	} else
 	  if (X > posY) {
@@ -127,7 +127,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 
 	    b[ 0] = data01;
 	    b[ 1] = data02;
-	    ao1 += lda;
+	    // ao1 += lda;
 	    b += 2;
 	  } else {
 #ifdef UNIT
@@ -139,7 +139,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	    b[ 0] = data01;
 	    b[ 1] = ZERO;
 #endif
-	    ao1 += lda;
+	    // ao1 += lda;
 	    b += 2;
 	  }
       }
diff --git a/kernel/generic/trmm_utcopy_4.c b/kernel/generic/trmm_utcopy_4.c
index 441f7338b..3e7726b61 100644
--- a/kernel/generic/trmm_utcopy_4.c
+++ b/kernel/generic/trmm_utcopy_4.c
@@ -201,18 +201,18 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	if (X < posY) {
 
 	  if (m & 2) {
-	    ao1 += 2;
+	    /* ao1 += 2;
 	    ao2 += 2;
 	    ao3 += 2;
-	    ao4 += 2;
+	    ao4 += 2; */
 	    b += 8;
 	  }
 
 	  if (m & 1) {
-	    ao1 += 1;
+	    /* ao1 += 1;
 	    ao2 += 1;
 	    ao3 += 1;
-	    ao4 += 1;
+	    ao4 += 1; */
 	    b += 4;
 	  }
 
@@ -238,7 +238,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	      b[ 7] = data08;
 
 	      ao1 += 2 * lda;
-	      ao2 += 2 * lda;
+	      // ao2 += 2 * lda;
 	      b   += 8;
 	    }
 
@@ -253,7 +253,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	      b[ 2] = data03;
 	      b[ 3] = data04;
 
-	      ao1 += lda;
+	      // ao1 += lda;
 	      b += 4;
 	    }
 
@@ -401,7 +401,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
       if (i) {
 
 	if (X < posY) {
-	  ao1 += 2;
+	  // ao1 += 2;
 	  b += 2;
 	} else
 	  if (X > posY) {
@@ -411,7 +411,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	    b[ 0] = data01;
 	    b[ 1] = data02;
 
-	    ao1 += lda;
+	    // ao1 += lda;
 	    b += 2;
 	  } else {
 #ifdef UNIT
diff --git a/kernel/generic/trmm_utcopy_8.c b/kernel/generic/trmm_utcopy_8.c
index 65fee357b..63106ac72 100644
--- a/kernel/generic/trmm_utcopy_8.c
+++ b/kernel/generic/trmm_utcopy_8.c
@@ -501,27 +501,27 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	if (X < posY) {
 
 	  if (m & 4) {
-	    ao1 += 4;
+	    /* ao1 += 4;
 	    ao2 += 4;
 	    ao3 += 4;
 	    ao4 += 4;
 	    ao5 += 4;
 	    ao6 += 4;
 	    ao7 += 4;
-	    ao8 += 4;
+	    ao8 += 4; */
 
 	    b += 32;
 	  }
 
 	  if (m & 2) {
-	    ao1 += 2;
+	    /* ao1 += 2;
 	    ao2 += 2;
 	    ao3 += 2;
 	    ao4 += 2;
 	    ao5 += 2;
 	    ao6 += 2;
 	    ao7 += 2;
-	    ao8 += 2;
+	    ao8 += 2; */
 
 	    b += 16;
 	  }
@@ -606,8 +606,8 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 
 	      ao1 += 4 * lda;
 	      ao2 += 4 * lda;
-	      ao3 += 4 * lda;
-	      ao4 += 4 * lda;
+	      /* ao3 += 4 * lda;
+	      ao4 += 4 * lda; */
 
 	      b += 32;
 	    }
@@ -1022,10 +1022,10 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	if (X < posY) {
 
 	  if (m & 2) {
-	    ao1 += 2;
+	    /* ao1 += 2;
 	    ao2 += 2;
 	    ao3 += 2;
-	    ao4 += 2;
+	    ao4 += 2; */
 
 	    b += 8;
 	  }
diff --git a/kernel/generic/trsm_ltcopy_4.c b/kernel/generic/trsm_ltcopy_4.c
index 12043eb33..07bb137d4 100644
--- a/kernel/generic/trsm_ltcopy_4.c
+++ b/kernel/generic/trsm_ltcopy_4.c
@@ -206,7 +206,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG offset, FLOAT
       }
 
       a1 += 2 * lda;
-      a2 += 2 * lda;
+      // a2 += 2 * lda;
       b += 8;
 
       ii += 2;
diff --git a/kernel/generic/trsm_ltcopy_8.c b/kernel/generic/trsm_ltcopy_8.c
index 35179d185..581578161 100644
--- a/kernel/generic/trsm_ltcopy_8.c
+++ b/kernel/generic/trsm_ltcopy_8.c
@@ -487,8 +487,8 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG offset, FLOAT
 
       a1 += 4 * lda;
       a2 += 4 * lda;
-      a3 += 4 * lda;
-      a4 += 4 * lda;
+      /* a3 += 4 * lda;
+      a4 += 4 * lda; */
       b += 32;
 
       ii += 4;
@@ -574,7 +574,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG offset, FLOAT
       }
 
       a1 += 2 * lda;
-      a2 += 2 * lda;
+      // a2 += 2 * lda;
       b += 16;
 
       ii += 2;
@@ -779,7 +779,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG offset, FLOAT
       }
 
       a1 += 2 * lda;
-      a2 += 2 * lda;
+      // a2 += 2 * lda;
       b += 8;
       ii += 2;
     }
diff --git a/kernel/generic/trsm_uncopy_8.c b/kernel/generic/trsm_uncopy_8.c
index 40903d44f..ec71f3f8d 100644
--- a/kernel/generic/trsm_uncopy_8.c
+++ b/kernel/generic/trsm_uncopy_8.c
@@ -646,7 +646,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG offset, FLOAT
 	*(b +  7) = data57;
       }
       b += 8;
-      ii += 1;
+      // ii += 1;
     }
 
     a +=  8 * lda;
@@ -835,7 +835,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG offset, FLOAT
 	*(b +  3) = data25;
       }
       b += 4;
-      ii += 1;
+      // ii += 1;
     }
 
     a +=  4 * lda;
@@ -908,7 +908,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG offset, FLOAT
 	*(b +  1) = data09;
       }
       b += 2;
-      ii += 1;
+      // ii += 1;
     }
 
     a +=  2 * lda;
diff --git a/kernel/generic/trsm_utcopy_4.c b/kernel/generic/trsm_utcopy_4.c
index f83617224..bd1b839cf 100644
--- a/kernel/generic/trsm_utcopy_4.c
+++ b/kernel/generic/trsm_utcopy_4.c
@@ -194,7 +194,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG offset, FLOAT
       }
 
       a1 += 2 * lda;
-      a2 += 2 * lda;
+      // a2 += 2 * lda;
       b += 8;
 
       ii += 2;
diff --git a/kernel/generic/trsm_utcopy_8.c b/kernel/generic/trsm_utcopy_8.c
index 97da66f87..47feb5974 100644
--- a/kernel/generic/trsm_utcopy_8.c
+++ b/kernel/generic/trsm_utcopy_8.c
@@ -453,8 +453,8 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG offset, FLOAT
 
       a1 += 4 * lda;
       a2 += 4 * lda;
-      a3 += 4 * lda;
-      a4 += 4 * lda;
+      /* a3 += 4 * lda;
+      a4 += 4 * lda; */
       b += 32;
       ii += 4;
     }
@@ -513,7 +513,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG offset, FLOAT
       }
 
       a1 += 2 * lda;
-      a2 += 2 * lda;
+      // a2 += 2 * lda;
       b += 16;
       ii += 2;
     }
@@ -680,7 +680,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG offset, FLOAT
       }
 
       a1 += 2 * lda;
-      a2 += 2 * lda;
+      // a2 += 2 * lda;
       b +=  8;
       ii += 2;
     }
diff --git a/kernel/generic/zgemm3m_tcopy_8.c b/kernel/generic/zgemm3m_tcopy_8.c
index fddbdd8cc..5f7160253 100644
--- a/kernel/generic/zgemm3m_tcopy_8.c
+++ b/kernel/generic/zgemm3m_tcopy_8.c
@@ -1044,7 +1044,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda,
 	*(b_offset2 +  3) = CMULT(a7,  a8);
 
 	a_offset1 += 8;
-	b_offset2 += 4;
+	// b_offset2 += 4;
       }
 
       if (n & 2){
@@ -1057,7 +1057,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda,
 	*(b_offset3 +  1) = CMULT(a3,  a4);
 
 	a_offset1 += 4;
-	b_offset3 += 2;
+	// b_offset3 += 2;
       }
 
       if (n & 1){
diff --git a/kernel/generic/zgemm_ncopy_4.c b/kernel/generic/zgemm_ncopy_4.c
index 0c2959b5f..fde96807a 100644
--- a/kernel/generic/zgemm_ncopy_4.c
+++ b/kernel/generic/zgemm_ncopy_4.c
@@ -225,10 +225,10 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, FLOAT *b){
 	*(boffset +  6) = ctemp07;
 	*(boffset +  7) = ctemp08;
 
-	aoffset1 +=  2;
+	/* aoffset1 +=  2;
 	aoffset2 +=  2;
 	aoffset3 +=  2;
-	aoffset4 +=  2;
+	aoffset4 +=  2; */
 	boffset  +=  8;
       }
       j--;
@@ -323,8 +323,8 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, FLOAT *b){
       *(boffset +  2) = ctemp03;
       *(boffset +  3) = ctemp04;
 
-      aoffset1 +=  2;
-      aoffset2 +=  2;
+      /* aoffset1 +=  2;
+      aoffset2 +=  2; */
       boffset  +=  4;
     }
   }
diff --git a/kernel/generic/zgemm_tcopy_2.c b/kernel/generic/zgemm_tcopy_2.c
index 70e202b71..2b12bb7dd 100644
--- a/kernel/generic/zgemm_tcopy_2.c
+++ b/kernel/generic/zgemm_tcopy_2.c
@@ -140,7 +140,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, FLOAT *b){
 	*(b_offset1 + 6) = ctemp11;
 	*(b_offset1 + 7) = ctemp12;
 
-	b_offset1 += m * 4;
+	// b_offset1 += m * 4;
 	a_offset1 += 4;
 	a_offset2 += 4;
       }
@@ -204,7 +204,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, FLOAT *b){
       *(b_offset + 2) = ctemp3;
       *(b_offset + 3) = ctemp4;
 
-      b_offset += m * 4;
+      // b_offset += m * 4;
       a_offset += 4;
     }
 
diff --git a/kernel/generic/zgemm_tcopy_4.c b/kernel/generic/zgemm_tcopy_4.c
index 969928d80..9b02e0eed 100644
--- a/kernel/generic/zgemm_tcopy_4.c
+++ b/kernel/generic/zgemm_tcopy_4.c
@@ -233,10 +233,10 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, FLOAT *b){
 	*(boffset3 +  6) = ctemp07;
 	*(boffset3 +  7) = ctemp08;
 
-	aoffset1 += 2;
+	/* aoffset1 += 2;
 	aoffset2 += 2;
 	aoffset3 += 2;
-	aoffset4 += 2;
+	aoffset4 += 2; */
 
 	boffset3 += 8;
       }
@@ -338,8 +338,8 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, FLOAT *b){
       *(boffset3 +  2) = ctemp03;
       *(boffset3 +  3) = ctemp04;
 
-      aoffset1 += 2;
-      aoffset2 += 2;
+      /* aoffset1 += 2;
+      aoffset2 += 2; */
       boffset3 += 4;
     }
   }
@@ -387,7 +387,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, FLOAT *b){
       *(boffset2 +  3) = ctemp04;
 
       aoffset1 += 4;
-      boffset2 += 4;
+      // boffset2 += 4;
     }
 
     if (n & 1){
diff --git a/kernel/generic/zgemm_tcopy_8.c b/kernel/generic/zgemm_tcopy_8.c
index bad835bb8..8d8988716 100644
--- a/kernel/generic/zgemm_tcopy_8.c
+++ b/kernel/generic/zgemm_tcopy_8.c
@@ -324,7 +324,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, FLOAT *b){
   if (n & 1){
     aoffset1  = aoffset;
     aoffset2  = aoffset + lda;
-    aoffset += 2;
+    // aoffset += 2;
 
     i = (m >> 1);
     if (i > 0){
@@ -353,7 +353,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, FLOAT *b){
 
       *(boffset +  0) = ctemp01;
       *(boffset +  1) = ctemp02;
-      boffset   += 2;
+      // boffset   += 2;
     }
   }
 
diff --git a/kernel/generic/ztrmm_lncopy_2.c b/kernel/generic/ztrmm_lncopy_2.c
index c620c78c1..dcd1f8c07 100644
--- a/kernel/generic/ztrmm_lncopy_2.c
+++ b/kernel/generic/ztrmm_lncopy_2.c
@@ -148,12 +148,12 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	  b[ 2] = data03;
 	  b[ 3] = data04;
 
-	  ao1 += 2;
-	  ao2 += 2;
+	  /* ao1 += 2;
+	  ao2 += 2; */
 	  b += 4;
 	} else
 	  if (X < posY) {
-	    ao1 += lda;
+	    // ao1 += lda;
 	    b += 4;
 	  } else {
 #ifdef UNIT
@@ -224,7 +224,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	} while (i > 0);
       }
 
-      posY += 1;
+      // posY += 1;
   }
   return 0;
 }
diff --git a/kernel/generic/ztrmm_lncopy_4.c b/kernel/generic/ztrmm_lncopy_4.c
index 5442105c5..7cb562ba3 100644
--- a/kernel/generic/ztrmm_lncopy_4.c
+++ b/kernel/generic/ztrmm_lncopy_4.c
@@ -355,23 +355,23 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	    b[ 6] = data25;
 	    b[ 7] = data26;
 
-	    ao1 += 2;
+	    /* ao1 += 2;
 	    ao2 += 2;
 	    ao3 += 2;
-	    ao4 += 2;
+	    ao4 += 2; */
 	    b += 8;
 	  }
 
 	} else
 	  if (X < posY) {
 	    if (m & 2) {
-	      ao1 += 2 * lda;
-	      ao2 += 2 * lda;
+	      /* ao1 += 2 * lda;
+	      ao2 += 2 * lda; */
 	      b += 16;
 	    }
 
 	    if (m & 1) {
-	      ao1 += lda;
+	      // ao1 += lda;
 	      b += 8;
 	    }
 
@@ -586,12 +586,12 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	    b[ 2] = data09;
 	    b[ 3] = data10;
 
-	    ao1 += 2;
-	    ao2 += 2;
+	    /* ao1 += 2;
+	    ao2 += 2; */
 	    b += 4;
 	} else
 	  if (X < posY) {
-	    ao1 += lda;
+	    // ao1 += lda;
 	    b += 4;
 	  } else {
 #ifdef UNIT
@@ -657,7 +657,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	} while (i > 0);
       }
 
-      posY += 1;
+      // posY += 1;
   }
 
   return 0;
diff --git a/kernel/generic/ztrmm_lncopy_8.c b/kernel/generic/ztrmm_lncopy_8.c
index 71d3bf1ce..0f173a17e 100644
--- a/kernel/generic/ztrmm_lncopy_8.c
+++ b/kernel/generic/ztrmm_lncopy_8.c
@@ -350,14 +350,14 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	  }
 	} else
 	  if (X < posY) {
-	    ao1 += i * lda;
+	    /* ao1 += i * lda;
 	    ao2 += i * lda;
 	    ao3 += i * lda;
 	    ao4 += i * lda;
 	    ao5 += i * lda;
 	    ao6 += i * lda;
 	    ao7 += i * lda;
-	    ao8 += i * lda;
+	    ao8 += i * lda; */
 	    b += 16 * i;
 	  } else {
 #ifdef UNIT
@@ -675,10 +675,10 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	  }
 	} else
 	  if (X < posY) {
-	    ao1 += i * lda;
+	    /* ao1 += i * lda;
 	    ao2 += i * lda;
 	    ao3 += i * lda;
-	    ao4 += i * lda;
+	    ao4 += i * lda; */
 	    b += 8 * i;
 	  } else {
 #ifdef UNIT
@@ -804,13 +804,13 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	  b[  1] = *(ao1 +  1);
 	  b[  2] = *(ao2 +  0);
 	  b[  3] = *(ao2 +  1);
-	  ao1 += 2;
-	  ao2 += 2;
+	  /* ao1 += 2;
+	  ao2 += 2; */
 	  b += 4;
 	} else
 	  if (X < posY) {
-	    ao1 += 2 * lda;
-	    ao2 += 2 * lda;
+	    /* ao1 += 2 * lda;
+	    ao2 += 2 * lda; */
 	    b += 4;
 	  } else {
 #ifdef UNIT
diff --git a/kernel/generic/ztrmm_ltcopy_2.c b/kernel/generic/ztrmm_ltcopy_2.c
index 457890ceb..deb675f73 100644
--- a/kernel/generic/ztrmm_ltcopy_2.c
+++ b/kernel/generic/ztrmm_ltcopy_2.c
@@ -141,8 +141,8 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
       if (m & 1) {
 
 	if (X > posY) {
-	  ao1 += 2;
-	  ao2 += 2;
+	  /* ao1 += 2;
+	  ao2 += 2; */
 	  b += 4;
 
 	} else
@@ -157,7 +157,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	    b[ 2] = data3;
 	    b[ 3] = data4;
 
-	    ao1 += lda;
+	    // ao1 += lda;
 	    b += 4;
 	  } else {
 #ifdef UNIT
@@ -233,7 +233,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	} while (i > 0);
       }
 
-      posY += 1;
+      // posY += 1;
   }
 
   return 0;
diff --git a/kernel/generic/ztrmm_ltcopy_4.c b/kernel/generic/ztrmm_ltcopy_4.c
index 42a809ba4..246a82641 100644
--- a/kernel/generic/ztrmm_ltcopy_4.c
+++ b/kernel/generic/ztrmm_ltcopy_4.c
@@ -292,18 +292,18 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	if (X > posY) {
 
 	  if (m & 2) {
-	    ao1 += 4;
+	    /* ao1 += 4;
 	    ao2 += 4;
 	    ao3 += 4;
-	    ao4 += 4;
+	    ao4 += 4; */
 	    b += 16;
 	  }
 
 	  if (m & 1) {
-	    ao1 += 2;
+	    /* ao1 += 2;
 	    ao2 += 2;
 	    ao3 += 2;
-	    ao4 += 2;
+	    ao4 += 2; */
 	    b += 8;
 	  }
 
@@ -347,7 +347,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	      b[15] = data16;
 
 	      ao1 += 2 * lda;
-	      ao2 += 2 * lda;
+	      // ao2 += 2 * lda;
 
 	      b += 16;
 	    }
@@ -371,7 +371,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	      b[ 6] = data07;
 	      b[ 7] = data08;
 
-	      ao1 += lda;
+	      // ao1 += lda;
 	      b += 8;
 	    }
 
@@ -588,8 +588,8 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
       if (i) {
 
 	if (X > posY) {
-	  ao1 += 2;
-	  ao2 += 2;
+	  /* ao1 += 2;
+	  ao2 += 2; */
 
 	  b += 4;
 	} else
@@ -604,7 +604,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	    b[ 2] = data03;
 	    b[ 3] = data04;
 
-	    ao1 += lda;
+	    // ao1 += lda;
 	    b += 4;
 
 	  } else {
@@ -678,7 +678,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	} while (i > 0);
       }
 
-      posY += 1;
+      // posY += 1;
   }
 
   return 0;
diff --git a/kernel/generic/ztrmm_ltcopy_8.c b/kernel/generic/ztrmm_ltcopy_8.c
index 09cb8037e..0af2420c3 100644
--- a/kernel/generic/ztrmm_ltcopy_8.c
+++ b/kernel/generic/ztrmm_ltcopy_8.c
@@ -317,14 +317,14 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
       i = (m & 7);
       if (i > 0) {
 	if (X > posY) {
-	  a01 += 2 * i;
+	  /* a01 += 2 * i;
 	  a02 += 2 * i;
 	  a03 += 2 * i;
 	  a04 += 2 * i;
 	  a05 += 2 * i;
 	  a06 += 2 * i;
 	  a07 += 2 * i;
-	  a08 += 2 * i;
+	  a08 += 2 * i; */
 	  b += 16 * i;
 	} else
 	  if (X < posY) {
@@ -661,10 +661,10 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
     i = (m & 3);
     if (i > 0) {
       if (X > posY) {
-	a01 += 2 * i;
+	/* a01 += 2 * i;
 	a02 += 2 * i;
 	a03 += 2 * i;
-	a04 += 2 * i;
+	a04 += 2 * i; */
 	b += 8 * i;
       } else
 	if (X < posY) {
@@ -802,8 +802,8 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
     i = (m & 1);
     if (i > 0) {
       if (X > posY) {
-	a01 += 2;
-	a02 += 2;
+	/* a01 += 2;
+	a02 += 2; */
 	b += 4;
       } else
 	if (X < posY) {
@@ -812,8 +812,8 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	  b[  2] = *(a01 +  2);
 	  b[  3] = *(a01 +  3);
 
-	  a01 += lda;
-	  a02 += lda;
+	  /* a01 += lda;
+	  a02 += lda; */
 	  b += 4;
 	} else {
 #ifdef UNIT
@@ -869,7 +869,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	i --;
       } while (i > 0);
     }
-    posY += 1;
+    // posY += 1;
   }
 
   return 0;
diff --git a/kernel/generic/ztrmm_uncopy_2.c b/kernel/generic/ztrmm_uncopy_2.c
index c2521d3c3..5cb0ffc54 100644
--- a/kernel/generic/ztrmm_uncopy_2.c
+++ b/kernel/generic/ztrmm_uncopy_2.c
@@ -153,12 +153,12 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	  b[ 2] = data03;
 	  b[ 3] = data04;
 
-	  ao1 += 2;
-	  ao2 += 2;
+	  /* ao1 += 2;
+	  ao2 += 2; */
 	  b += 4;
 	} else
 	  if (X > posY) {
-	    ao1 += lda;
+	    // ao1 += lda;
 	    b += 4;
 	  } else {
 #ifdef UNIT
diff --git a/kernel/generic/ztrmm_uncopy_4.c b/kernel/generic/ztrmm_uncopy_4.c
index 249faac1d..e282bd1c7 100644
--- a/kernel/generic/ztrmm_uncopy_4.c
+++ b/kernel/generic/ztrmm_uncopy_4.c
@@ -354,23 +354,23 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	    b[ 6] = data25;
 	    b[ 7] = data26;
 
-	    ao1 += 2;
+	    /* ao1 += 2;
 	    ao2 += 2;
 	    ao3 += 2;
-	    ao4 += 2;
+	    ao4 += 2; */
 	    b += 8;
 	  }
 
 	} else
 	  if (X > posY) {
 	    if (m & 2) {
-	      ao1 += 2 * lda;
-	      ao2 += 2 * lda;
+	      /* ao1 += 2 * lda;
+	      ao2 += 2 * lda; */
 	      b   += 16;
 	    }
 
 	    if (m & 1) {
-	      ao1 += lda;
+	      // ao1 += lda;
 	      b += 8;
 	    }
 
@@ -596,13 +596,13 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	    b[ 1] = data02;
 	    b[ 2] = data09;
 	    b[ 3] = data10;
-	    ao1 += 2;
-	    ao2 += 2;
+	    /* ao1 += 2;
+	    ao2 += 2; */
 	    b += 4;
 	} else
 	  if (X > posY) {
-	    ao1 += 2 * lda;
-	    ao2 += 2 * lda;
+	    /* ao1 += 2 * lda;
+	    ao2 += 2 * lda; */
 	    b += 4;
 	  } else {
 #ifdef UNIT
@@ -624,8 +624,8 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	    b[ 2] = data09;
 	    b[ 3] = data10;
 #endif
-	    ao1 += 2;
-	    ao2 += 2;
+	    /* ao1 += 2;
+	    ao2 += 2; */
 	    b += 4;
 	  }
       }
diff --git a/kernel/generic/ztrmm_uncopy_8.c b/kernel/generic/ztrmm_uncopy_8.c
index faadd2196..c3ea0c85e 100644
--- a/kernel/generic/ztrmm_uncopy_8.c
+++ b/kernel/generic/ztrmm_uncopy_8.c
@@ -350,14 +350,14 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	  }
 	} else
 	  if (X > posY) {
-	    ao1 += i * lda;
+	    /* ao1 += i * lda;
 	    ao2 += i * lda;
 	    ao3 += i * lda;
 	    ao4 += i * lda;
 	    ao5 += i * lda;
 	    ao6 += i * lda;
 	    ao7 += i * lda;
-	    ao8 += i * lda;
+	    ao8 += i * lda; */
 	    b += 16 * i;
 	  } else {
 #ifdef UNIT
@@ -677,10 +677,10 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	  }
 	} else
 	  if (X > posY) {
-	    ao1 += i * lda;
+	    /* ao1 += i * lda;
 	    ao2 += i * lda;
 	    ao3 += i * lda;
-	    ao4 += i * lda;
+	    ao4 += i * lda; */
 	    b += 8 * i;
 	  } else {
 #ifdef UNIT
@@ -807,13 +807,13 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	  b[  1] = *(ao1 +  1);
 	  b[  2] = *(ao2 +  0);
 	  b[  3] = *(ao2 +  1);
-	  ao1 += 2;
-	  ao2 += 2;
+	  /* ao1 += 2;
+	  ao2 += 2; */
 	  b += 4;
 	} else
 	  if (X > posY) {
-	    ao1 += 2 * lda;
-	    ao2 += 2 * lda;
+	    /* ao1 += 2 * lda;
+	    ao2 += 2 * lda; */
 	    b += 4;
 	  } else {
 #ifdef UNIT
diff --git a/kernel/generic/ztrmm_utcopy_2.c b/kernel/generic/ztrmm_utcopy_2.c
index 840821e16..6c7288ae9 100644
--- a/kernel/generic/ztrmm_utcopy_2.c
+++ b/kernel/generic/ztrmm_utcopy_2.c
@@ -142,8 +142,8 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 
       if (m & 1) {
       	if (X < posY) {
-	  ao1 += 2;
-	  ao2 += 2;
+	  /* ao1 += 2;
+	  ao2 += 2; */
 	  b += 4;
 	} else
 	  if (X > posY) {
@@ -157,7 +157,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	    b[ 2] = data3;
 	    b[ 3] = data4;
 
-	    ao1 += lda;
+	    // ao1 += lda;
 	    b += 4;
 
 	  } else {
diff --git a/kernel/generic/ztrmm_utcopy_4.c b/kernel/generic/ztrmm_utcopy_4.c
index 9a5c8c362..e6b89e7bf 100644
--- a/kernel/generic/ztrmm_utcopy_4.c
+++ b/kernel/generic/ztrmm_utcopy_4.c
@@ -294,18 +294,18 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	if (X < posY) {
 
 	  if (m & 2) {
-	    ao1 += 4;
+	    /* ao1 += 4;
 	    ao2 += 4;
 	    ao3 += 4;
-	    ao4 += 4;
+	    ao4 += 4; */
 	    b += 16;
 	  }
 
 	  if (m & 1) {
-	    ao1 += 2;
+	    /* ao1 += 2;
 	    ao2 += 2;
 	    ao3 += 2;
-	    ao4 += 2;
+	    ao4 += 2; */
 	    b += 8;
 	  }
 
@@ -349,7 +349,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	      b[15] = data16;
 
 	      ao1 += 2 * lda;
-	      ao2 += 2 * lda;
+	      // ao2 += 2 * lda;
 	      b   += 16;
 	    }
 
@@ -372,7 +372,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	      b[ 6] = data07;
 	      b[ 7] = data08;
 
-	      ao1 += lda;
+	      // ao1 += lda;
 	      b += 8;
 	    }
 
diff --git a/kernel/generic/ztrmm_utcopy_8.c b/kernel/generic/ztrmm_utcopy_8.c
index fb286d0e6..ed4578579 100644
--- a/kernel/generic/ztrmm_utcopy_8.c
+++ b/kernel/generic/ztrmm_utcopy_8.c
@@ -320,14 +320,14 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 
 	if (X < posY) {
 
-	    a01 += 2 * i;
+	    /* a01 += 2 * i;
 	    a02 += 2 * i;
 	    a03 += 2 * i;
 	    a04 += 2 * i;
 	    a05 += 2 * i;
 	    a06 += 2 * i;
 	    a07 += 2 * i;
-	    a08 += 2 * i;
+	    a08 += 2 * i; */
 	    b += 16 * i;
 	} else
 	  if (X > posY) {
@@ -664,10 +664,10 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
     if (i) {
 
       if (X < posY) {
-	a01 += 2 * i;
+	/* a01 += 2 * i;
 	a02 += 2 * i;
 	a03 += 2 * i;
-	a04 += 2 * i;
+	a04 += 2 * i; */
 	b += 8 * i;
       } else
 	if (X > posY) {
diff --git a/kernel/generic/ztrsm_lncopy_4.c b/kernel/generic/ztrsm_lncopy_4.c
index 2ad05401a..2a1302e53 100644
--- a/kernel/generic/ztrsm_lncopy_4.c
+++ b/kernel/generic/ztrsm_lncopy_4.c
@@ -313,13 +313,13 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG offset, FLOAT
 	*(b +  7) = data26;
      }
 
-      a1 += 2;
+      /* a1 += 2;
       a2 += 2;
       a3 += 2;
-      a4 += 2;
+      a4 += 2; */
       b +=  8;
 
-      ii += 1;
+      // ii += 1;
     }
     a += 4 * lda;
     jj += 4;
@@ -410,11 +410,11 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG offset, FLOAT
 	*(b +  3) = data10;
      }
 
-      a1 += 2;
-      a2 += 2;
+      /* a1 += 2;
+      a2 += 2; */
       b +=  4;
 
-      ii += 1;
+      // ii += 1;
     }
     a += 2 * lda;
     jj += 2;
@@ -451,8 +451,8 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG offset, FLOAT
       ii += 1;
     }
 
-    a += lda;
-    jj += 1;
+    // a += lda;
+    // jj += 1;
   }
 
   return 0;
diff --git a/kernel/generic/ztrsm_ltcopy_4.c b/kernel/generic/ztrsm_ltcopy_4.c
index c1152710e..be28ba646 100644
--- a/kernel/generic/ztrsm_ltcopy_4.c
+++ b/kernel/generic/ztrsm_ltcopy_4.c
@@ -286,7 +286,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG offset, FLOAT
       }
 
       a1 += 2 * lda;
-      a2 += 2 * lda;
+      // a2 += 2 * lda;
       b += 16;
 
       ii += 2;
@@ -335,9 +335,9 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG offset, FLOAT
 	*(b +  7) = data08;
       }
 
-      a1 += lda;
+      // a1 += lda;
       b += 8;
-      ii += 1;
+      // ii += 1;
     }
 
     a  += 8;
@@ -430,9 +430,9 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG offset, FLOAT
 	*(b +  3) = data04;
       }
 
-      a1 += lda;
+      // a1 += lda;
       b += 4;
-      ii += 1;
+      // ii += 1;
     }
 
     a  += 4;
@@ -471,8 +471,8 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG offset, FLOAT
       ii += 1;
     }
 
-    a  += 2;
-    jj += 1;
+    // a  += 2;
+    // jj += 1;
   }
 
   return 0;
diff --git a/kernel/generic/ztrsm_uncopy_4.c b/kernel/generic/ztrsm_uncopy_4.c
index 9d0e2438d..fe33e41c7 100644
--- a/kernel/generic/ztrsm_uncopy_4.c
+++ b/kernel/generic/ztrsm_uncopy_4.c
@@ -344,13 +344,13 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG offset, FLOAT
 	*(b +  7) = data26;
       }
 
-      a1 += 2;
+      /* a1 += 2;
       a2 += 2;
       a3 += 2;
-      a4 += 2;
+      a4 += 2; */
       b +=  8;
 
-      ii += 1;
+      // ii += 1;
     }
 
     a += 4 * lda;
@@ -444,11 +444,11 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG offset, FLOAT
 	*(b +  3) = data10;
       }
 
-      a1 += 2;
-      a2 += 2;
+      /* a1 += 2;
+      a2 += 2; */
       b +=  4;
 
-      ii += 1;
+      // ii += 1;
     }
 
     a += 2 *lda;
@@ -488,8 +488,8 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG offset, FLOAT
       ii += 1;
     }
 
-    a += lda;
-    jj += 1;
+    // a += lda;
+    // jj += 1;
   }
 
   return 0;
diff --git a/kernel/generic/ztrsm_utcopy_4.c b/kernel/generic/ztrsm_utcopy_4.c
index f19badd33..b419f6b90 100644
--- a/kernel/generic/ztrsm_utcopy_4.c
+++ b/kernel/generic/ztrsm_utcopy_4.c
@@ -266,7 +266,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG offset, FLOAT
       }
 
       a1 += 2 * lda;
-      a2 += 2 * lda;
+      // a2 += 2 * lda;
       b += 16;
 
       ii += 2;
@@ -303,10 +303,10 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG offset, FLOAT
 	*(b +  7) = data08;
       }
 
-      a1 += lda;
+      // a1 += lda;
       b  += 8;
 
-      ii += 1;
+      // ii += 1;
     }
 
     a  += 8;
@@ -394,10 +394,10 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG offset, FLOAT
 	*(b +  3) = data04;
       }
 
-      a1 += lda;
+      // a1 += lda;
       b  += 4;
 
-      ii += 1;
+      // ii += 1;
     }
 
     a  += 4;
@@ -436,8 +436,8 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG offset, FLOAT
       ii += 1;
     }
 
-    a  += 2;
-    jj += 1;
+    // a  += 2;
+    // jj += 1;
   }
 
   return 0;
diff --git a/kernel/x86_64/zgemv_t_4.c b/kernel/x86_64/zgemv_t_4.c
index 20ccf06f7..c4a38202b 100644
--- a/kernel/x86_64/zgemv_t_4.c
+++ b/kernel/x86_64/zgemv_t_4.c
@@ -313,7 +313,7 @@ int CNAME(BLASLONG m, BLASLONG n, BLASLONG dummy1, FLOAT alpha_r, FLOAT alpha_i,
 
 			for( i = 0; i < n1 ; i++)
 			{
-				memset(ybuffer,0,64);
+				memset(ybuffer,0,sizeof(ybuffer));
 				zgemv_kernel_4x4(NB,ap,xbuffer,ybuffer,alpha);
 				ap[0] += lda4;
 				ap[1] += lda4;
@@ -338,7 +338,7 @@ int CNAME(BLASLONG m, BLASLONG n, BLASLONG dummy1, FLOAT alpha_r, FLOAT alpha_i,
 
 			for( i = 0; i < n2 ; i++)
 			{
-				memset(ybuffer,0,64);
+				memset(ybuffer,0,sizeof(ybuffer));
 				zgemv_kernel_4x1(NB,a_ptr,xbuffer,ybuffer,alpha);
 				a_ptr += lda;
 				y_ptr[0] += ybuffer[0];
diff --git a/kernel/zarch/zgemv_t_4.c b/kernel/zarch/zgemv_t_4.c
index ba992b767..94a056cab 100644
--- a/kernel/zarch/zgemv_t_4.c
+++ b/kernel/zarch/zgemv_t_4.c
@@ -518,7 +518,7 @@ int CNAME(BLASLONG m, BLASLONG n, BLASLONG dummy1, FLOAT alpha_r, FLOAT alpha_i,
 
             for( i = 0; i < n1 ; i++)
             {
-                memset(ybuffer,0,64);
+                memset(ybuffer,0,sizeof(ybuffer));
                 zgemv_kernel_4x4(NB,ap,xbuffer,ybuffer,alpha);
                 ap[0] += lda4;
                 ap[1] += lda4;
@@ -543,7 +543,7 @@ int CNAME(BLASLONG m, BLASLONG n, BLASLONG dummy1, FLOAT alpha_r, FLOAT alpha_i,
 
             for( i = 0; i < n2 ; i++)
             {
-                memset(ybuffer,0,64);
+                memset(ybuffer,0,sizeof(ybuffer));
                 zgemv_kernel_4x1(NB,a_ptr,xbuffer,ybuffer,alpha);
                 a_ptr += lda;
                 y_ptr[0] += ybuffer[0];