diff --git a/Dumps/EM4233_example.dmp b/Dumps/EM4233_example.dmp
index 7e87a06..e9f4caa 100644
Binary files a/Dumps/EM4233_example.dmp and b/Dumps/EM4233_example.dmp differ
diff --git a/Firmware/Chameleon-Mini/Application/EM4233.c b/Firmware/Chameleon-Mini/Application/EM4233.c
index 475c277..b9cfeb6 100644
--- a/Firmware/Chameleon-Mini/Application/EM4233.c
+++ b/Firmware/Chameleon-Mini/Application/EM4233.c
@@ -443,15 +443,17 @@ uint16_t EM4233_Select(uint8_t* FrameBuf, uint16_t FrameBytes, uint8_t* Uid)
         return ISO15693_APP_NO_RESPONSE;
     } else if (State == STATE_SELECTED && !UidEquals) {
         /* tag should remain silent if Select is performed while the tag is selected but against another tag */
-        State == STATE_READY;
+        State = STATE_READY;
         return ISO15693_APP_NO_RESPONSE;
     } else if (State != STATE_SELECTED && !UidEquals) {
         /* tag should remain silent if Select is performed against another UID */
         return ISO15693_APP_NO_RESPONSE;
     } else if (State != STATE_SELECTED && UidEquals) {
-        State == STATE_SELECTED;
+        State = STATE_SELECTED;
         return ISO15693_APP_NO_RESPONSE; /* real tag does not respond anyway */
     }
+
+    return ISO15693_APP_NO_RESPONSE;
 }
 
 uint16_t EM4233_Login(uint8_t* FrameBuf, uint16_t FrameBytes, uint8_t* Uid)
@@ -477,8 +479,7 @@ uint16_t EM4233_Login(uint8_t* FrameBuf, uint16_t FrameBytes, uint8_t* Uid)
 
     loggedIn = true;
 
-    MemoryWriteBlock(Password, EM4233_MEM_PSW_ADDRESS, 1); /* Actually write new AFI */
-
+    MemoryWriteBlock(Password, EM4233_MEM_PSW_ADDRESS, 4); /* Actually write new AFI */
 
     FrameBuf[ISO15693_ADDR_FLAGS] = ISO15693_RES_FLAG_NO_ERROR; /* flags */
     ResponseByteCount += 1; 
@@ -501,7 +502,7 @@ uint16_t EM4233AppProcess(uint8_t* FrameBuf, uint16_t FrameBytes)
             ISO15693CopyUid(&FrameBuf[ISO15693_RES_ADDR_PARAM + 0x01], Uid);
             ResponseByteCount = 10;
 
-        } else if (*FrameInfo.Command == ISO15693_CMD_STAY_QUIET && FrameInfo.Addressed) {
+        } else if ( (*FrameInfo.Command == ISO15693_CMD_STAY_QUIET ) && FrameInfo.Addressed) {
             State = STATE_QUIET;
 
         } else if (*FrameInfo.Command == ISO15693_CMD_READ_SINGLE) {
@@ -545,8 +546,7 @@ uint16_t EM4233AppProcess(uint8_t* FrameBuf, uint16_t FrameBytes)
             FrameBuf[ISO15693_RES_ADDR_PARAM] = ISO15693_RES_ERR_NOT_SUPP;
             ResponseByteCount = 2;
         }
-    }
-    else if (State == STATE_QUIET) {
+    } else if (State == STATE_QUIET) {
         if (*FrameInfo.Command == ISO15693_CMD_RESET_TO_READY) {
             FrameBuf[ISO15693_ADDR_FLAGS] = ISO15693_RES_FLAG_NO_ERROR;
             ResponseByteCount = 1;
diff --git a/Firmware/Chameleon-Mini/Application/ISO15693-A.c b/Firmware/Chameleon-Mini/Application/ISO15693-A.c
index a87ab33..38aa01b 100644
--- a/Firmware/Chameleon-Mini/Application/ISO15693-A.c
+++ b/Firmware/Chameleon-Mini/Application/ISO15693-A.c
@@ -89,7 +89,7 @@ bool ISO15693PrepareFrame(uint8_t* FrameBuf, uint16_t FrameBytes, CurrentFrame*
     else
         FrameStruct -> Parameters = &FrameBuf[ISO15693_REQ_ADDR_PARAM];
     
-    if (*(FrameStruct -> Command) >= 0xA0) { /* if command is Custom or  Proprietary */
+    if ( (*FrameStruct -> Command) >= 0xA0) { /* if command is Custom or  Proprietary */
         /* then between CMD and UID is placed another byte which is IC Mfg Code, but we don't need it */
         FrameStruct -> Parameters += 0x01;
         if (FrameBuf[ISO15693_REQ_ADDR_PARAM] != MyUid[1])
@@ -99,7 +99,9 @@ bool ISO15693PrepareFrame(uint8_t* FrameBuf, uint16_t FrameBytes, CurrentFrame*
 
     FrameStruct -> ParamLen = FrameBuf + (FrameBytes - ISO15693_CRC16_SIZE) - (FrameStruct -> Parameters);
 
-    if (FrameStruct -> Addressed && !ISO15693CompareUid(FrameStruct -> Parameters, MyUid)) {
+    uint8_t *uid = (FrameStruct -> Parameters) - ISO15693_GENERIC_UID_SIZE;
+
+    if (FrameStruct -> Addressed && !ISO15693CompareUid( uid, MyUid)) {
         /* addressed request but we're not the addressee */
         return false;
     } else {