diff --git a/client.c b/client.c
index eaccf86..8dcf4fc 100644
--- a/client.c
+++ b/client.c
@@ -37,7 +37,7 @@ int client_connect(conn_handler handler, char *servip, int16_t port) {
     bzero(buffer, MAX_BUFSIZE);
     for (ret = 0; 0 == ret;) {
         ret = handler(buffer);
-        if(0 > ret)
+        if(0 < ret)
             break;
 
         if (0 >= write(connfd, buffer, strlen(buffer))) {
diff --git a/create_tpm_key b/create_tpm_key
new file mode 100755
index 0000000..5de31c5
Binary files /dev/null and b/create_tpm_key differ
diff --git a/ecdaa_issuer b/ecdaa_issuer
new file mode 100755
index 0000000..e032963
Binary files /dev/null and b/ecdaa_issuer differ
diff --git a/ecdaa_member b/ecdaa_member
new file mode 100755
index 0000000..af4b207
Binary files /dev/null and b/ecdaa_member differ
diff --git a/ecdaa_member_tpm b/ecdaa_member_tpm
new file mode 100755
index 0000000..ac6f7d0
Binary files /dev/null and b/ecdaa_member_tpm differ
diff --git a/ecdaa_test b/ecdaa_test
new file mode 100755
index 0000000..cd2d4ac
Binary files /dev/null and b/ecdaa_test differ
diff --git a/ecdaa_test_tpm b/ecdaa_test_tpm
new file mode 100755
index 0000000..1159b08
Binary files /dev/null and b/ecdaa_test_tpm differ
diff --git a/ecdaa_verifier b/ecdaa_verifier
new file mode 100755
index 0000000..e1b1868
Binary files /dev/null and b/ecdaa_verifier differ
diff --git a/verifier.c b/verifier.c
index ba43733..763856a 100644
--- a/verifier.c
+++ b/verifier.c
@@ -39,16 +39,22 @@ int main(int argc, char **argv) {
                 printf("Could not import key file. Importing from %s was not successful",verifier_ipk_file);
                 return 1;
             }
+	    printf("verifier_setup: loaded keys from disk\n");
             verifier.state = GOTISSUER;
             break;
         case 3:
             if( 0 == strncasecmp("--public", argv[1], 6) || 0 == strncasecmp("-p", argv[1], 2)) {
                 verifier.state = ON;
                 remote_ip = argv[2];
-                ret = client_connect(&verifier_getissuer, remote_ip, VERIFIERPORT);
+                ret = client_connect(&verifier_getissuer, remote_ip, ISSUERPORT);
                 if (0 >= ret || GOTISSUER != verifier.state) {
                     printf("connection to issuer failed\n");
                 }
+                if(0 != ecdaa_issuer_public_key_FP256BN_serialize_file(verifier_ipk_file, &verifier.ipk)) {
+                    printf("issuer_setup: Error saving key-pair to disk\n");
+                    return -1;
+                }
+		printf("verifier_setup: wrote new issuer's public key to %s\n", verifier_ipk_file);
             } else {
 	    	printf("arguments invalid\n");
 	    }