diff --git a/client/loclass/cipher.c b/client/loclass/cipher.c
index f4812a7ca..0790bfb51 100644
--- a/client/loclass/cipher.c
+++ b/client/loclass/cipher.c
@@ -22,7 +22,7 @@
  *
  * This is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
+ * by the Free Software Foundation, or, at your option, any later version. 
  *
  * This file is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -33,7 +33,6 @@
  * along with loclass.  If not, see <http://www.gnu.org/licenses/>.
  * 
  * 
- * 
  ****************************************************************************/
 
 
diff --git a/client/loclass/cipher.h b/client/loclass/cipher.h
index 7afdb524c..632910a98 100644
--- a/client/loclass/cipher.h
+++ b/client/loclass/cipher.h
@@ -22,7 +22,7 @@
  *
  * This is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
+ * by the Free Software Foundation, or, at your option, any later version. 
  *
  * This file is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -33,7 +33,6 @@
  * along with loclass.  If not, see <http://www.gnu.org/licenses/>.
  * 
  * 
- * 
  ****************************************************************************/
 
 
diff --git a/client/loclass/cipherutils.c b/client/loclass/cipherutils.c
index 427d3a254..b5e365bf4 100644
--- a/client/loclass/cipherutils.c
+++ b/client/loclass/cipherutils.c
@@ -22,7 +22,7 @@
  *
  * This is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
+ * by the Free Software Foundation, or, at your option, any later version. 
  *
  * This file is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -33,7 +33,6 @@
  * along with loclass.  If not, see <http://www.gnu.org/licenses/>.
  * 
  * 
- * 
  ****************************************************************************/
 
 #include <stdint.h>
@@ -280,6 +279,7 @@ int testReversedBitstream()
 	return 0;
 }
 
+
 int testCipherUtils(void)
 {
 	prnlog("[+] Testing some internals...");
diff --git a/client/loclass/cipherutils.h b/client/loclass/cipherutils.h
index 3cdbf5fa7..568671791 100644
--- a/client/loclass/cipherutils.h
+++ b/client/loclass/cipherutils.h
@@ -22,7 +22,7 @@
  *
  * This is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
+ * by the Free Software Foundation, or, at your option, any later version. 
  *
  * This file is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -33,7 +33,6 @@
  * along with loclass.  If not, see <http://www.gnu.org/licenses/>.
  * 
  * 
- * 
  ****************************************************************************/
 
 
diff --git a/client/loclass/elite_crack.c b/client/loclass/elite_crack.c
index 44f3eb6c0..48b0c7b64 100644
--- a/client/loclass/elite_crack.c
+++ b/client/loclass/elite_crack.c
@@ -22,7 +22,7 @@
  *
  * This is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
+ * by the Free Software Foundation, or, at your option, any later version. 
  *
  * This file is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -232,15 +232,15 @@ void hash2(uint8_t *key64, uint8_t *outp_keytable)
     // Once again, key is on iclass-format
     desencrypt_iclass(key64, key64_negated, z[0]);
 
-    prnlog("\nHigh security custom key (Kcus):");
-    printvar("z0  ",  z[0],8);
+//    prnlog("\nHigh security custom key (Kcus):");
+//    printvar("z0  ",  z[0],8);
 
     uint8_t y[8][8]={{0},{0}};
 
     // y[0]=DES_dec(z[0],~key)
     // Once again, key is on iclass-format
     desdecrypt_iclass(z[0], key64_negated, y[0]);
-    printvar("y0  ",  y[0],8);
+//    printvar("y0  ",  y[0],8);
 
     for (i=1; i<8; i++) {
         // z [i] = DES dec (rk(K cus , i), z [i−1] )
diff --git a/client/loclass/elite_crack.h b/client/loclass/elite_crack.h
index fb27355fd..46791fb5d 100644
--- a/client/loclass/elite_crack.h
+++ b/client/loclass/elite_crack.h
@@ -22,7 +22,7 @@
  *
  * This is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
+ * by the Free Software Foundation, or, at your option, any later version. 
  *
  * This file is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -33,7 +33,6 @@
  * along with loclass.  If not, see <http://www.gnu.org/licenses/>.
  * 
  * 
- * 
  ****************************************************************************/
 
 
diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index f442e0cfb..efb8d0304 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -22,7 +22,7 @@
  *
  * This is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
+ * by the Free Software Foundation, or, at your option, any later version. 
  *
  * This file is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -33,7 +33,6 @@
  * along with loclass.  If not, see <http://www.gnu.org/licenses/>.
  * 
  * 
- * 
  ****************************************************************************/
 #ifndef ON_DEVICE
 
diff --git a/client/loclass/fileutils.h b/client/loclass/fileutils.h
index a59704f34..5bd4a1409 100644
--- a/client/loclass/fileutils.h
+++ b/client/loclass/fileutils.h
@@ -22,7 +22,7 @@
  *
  * This is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
+ * by the Free Software Foundation, or, at your option, any later version. 
  *
  * This file is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -33,7 +33,6 @@
  * along with loclass.  If not, see <http://www.gnu.org/licenses/>.
  * 
  * 
- * 
  ****************************************************************************/
 
 #ifndef FILEUTILS_H
diff --git a/client/loclass/ikeys.c b/client/loclass/ikeys.c
index c1832105e..861cc10e8 100644
--- a/client/loclass/ikeys.c
+++ b/client/loclass/ikeys.c
@@ -22,7 +22,7 @@
  *
  * This is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
+ * by the Free Software Foundation, or, at your option, any later version. 
  *
  * This file is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -33,10 +33,11 @@
  * along with loclass.  If not, see <http://www.gnu.org/licenses/>.
  * 
  * 
- * 
  ****************************************************************************/
+
 /**
 
+
 From "Dismantling iclass":
 	This section describes in detail the built-in key diversification algorithm of iClass.
 	Besides the obvious purpose of deriving a card key from a master key, this
diff --git a/client/loclass/ikeys.h b/client/loclass/ikeys.h
index 13096194d..5b44d1796 100644
--- a/client/loclass/ikeys.h
+++ b/client/loclass/ikeys.h
@@ -22,7 +22,7 @@
  *
  * This is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
+ * by the Free Software Foundation, or, at your option, any later version. 
  *
  * This file is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -33,7 +33,6 @@
  * along with loclass.  If not, see <http://www.gnu.org/licenses/>.
  * 
  * 
- * 
  ****************************************************************************/
 
 #ifndef IKEYS_H
diff --git a/client/loclass/main.c b/client/loclass/main.c
index 95112f7de..fa9886ee9 100644
--- a/client/loclass/main.c
+++ b/client/loclass/main.c
@@ -22,7 +22,7 @@
  *
  * This is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
+ * by the Free Software Foundation, or, at your option, any later version. 
  *
  * This file is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -33,7 +33,6 @@
  * along with loclass.  If not, see <http://www.gnu.org/licenses/>.
  * 
  * 
- * 
  ****************************************************************************/