diff --git a/AUTHORS.MD b/AUTHORS.MD
index 519bbf8a..9320c86b 100644
--- a/AUTHORS.MD
+++ b/AUTHORS.MD
@@ -4,7 +4,7 @@ Onionr is created by a team of hard working volunteers.
 
 In no order of importance, these people make Onionr happen:
 
-* [Beardog](https://www.chaoswebs.net/) - Project owner and core developer
+* [Beardog (Kevin Froman)](https://www.chaoswebs.net/) - Project owner and core developer
 * [InvisaMage](https://invisamage.com/) - Web UI Bulma design
 * [Arinerron](https://arinerron.com/) - Logger and config modules, testing and other contributions
 * [Anhar Ismail](https://github.com/anharismail) - Created Onionr's logo
diff --git a/README.md b/README.md
index 7f314023..f7564d68 100644
--- a/README.md
+++ b/README.md
@@ -128,7 +128,9 @@ Onionr Mail: TRH763JURNY47QPBTTQ4LLPYCYQK6Q5YA33R6GANKZK5C5DKCIGQ
 
 ## Disclaimers and legal
 
-No matter how good Onionr and other software gets, there will always be ways for clever or well-funded adversaries to break your security. 
+No matter how good Onionr and other software gets, there will always be ways for clever or well-funded adversaries to break your security.
+
+Onionr does not protect your identity if you associate your user ID with your name either on Onionr or elsewhere.
 
 *Do not rely on Onionr or any other software to hold up if your life or liberty are at stake.*
 
diff --git a/onionr/communicator/peeraction.py b/onionr/communicator/peeraction.py
index d6e3fb4a..f3b73cfe 100644
--- a/onionr/communicator/peeraction.py
+++ b/onionr/communicator/peeraction.py
@@ -22,6 +22,7 @@ import logger
 from onionrutils import epoch, basicrequests
 from coredb import keydb
 from . import onlinepeers
+
 def peer_action(comm_inst, peer, action, returnHeaders=False, max_resp_size=5242880):
     '''Perform a get request to a peer'''
     penalty_score = -10
@@ -29,9 +30,6 @@ def peer_action(comm_inst, peer, action, returnHeaders=False, max_resp_size=5242
         return False
     url = 'http://%s/%s' % (peer, action)
 
-    # mark the time we're trying to request this peer
-    keydb.transportinfo.set_address_info(peer, 'lastConnectAttempt', epoch.get_epoch())
-
     try:
         ret_data = basicrequests.do_get_request(url, port=comm_inst.proxyPort,
                                                 max_size=max_resp_size)
@@ -44,6 +42,7 @@ def peer_action(comm_inst, peer, action, returnHeaders=False, max_resp_size=5242
         try:
             comm_inst.getPeerProfileInstance(peer).addScore(penalty_score)
             onlinepeers.remove_online_peer(comm_inst, peer)
+            keydb.transportinfo.set_address_info(peer, 'lastConnectAttempt', epoch.get_epoch())
             if action != 'ping' and not comm_inst.shutdown:
                 logger.warn('Lost connection to ' + peer, terminal=True)
                 onlinepeers.get_online_peers(comm_inst) # Will only add a new peer to pool if needed
diff --git a/onionr/onionrcommands/daemonlaunch.py b/onionr/onionrcommands/daemonlaunch.py
index 23e57f9e..b2aa4f99 100755
--- a/onionr/onionrcommands/daemonlaunch.py
+++ b/onionr/onionrcommands/daemonlaunch.py
@@ -104,7 +104,10 @@ def daemon():
     localcommand.local_command('shutdown')
 
     net.killTor()
-    time.sleep(5) # Time to allow threads to finish, if not any "daemon" threads will be slaughtered http://docs.python.org/library/threading.html#threading.Thread.daemon
+    try:
+        time.sleep(5) # Time to allow threads to finish, if not any "daemon" threads will be slaughtered http://docs.python.org/library/threading.html#threading.Thread.daemon
+    except KeyboardInterrupt:
+        pass
     cleanup.delete_run_files()
 
 def _ignore_sigint(sig, frame):
diff --git a/onionr/static-data/default-plugins/pms/main.py b/onionr/static-data/default-plugins/pms/main.py
index 1dba4a08..b4c9e863 100755
--- a/onionr/static-data/default-plugins/pms/main.py
+++ b/onionr/static-data/default-plugins/pms/main.py
@@ -57,16 +57,15 @@ def on_processblocks(api, data=None):
     if data['type'] != 'pm':
         return
     data['block'].decrypt()
-    metadata = data['block'].bmetadata # Get the block metadata
+    metadata = data['block'].bmetadata
 
     signer = bytesconverter.bytes_to_str(data['block'].signer)
     user = contactmanager.ContactManager(signer, saveUser=False)
     name = user.get_info("name")
-    if name != 'anonymous':
+    if name != 'anonymous' and name != None:
         signer = name.title()
     else:
         signer = signer[:5]
 
     if data['block'].decrypted:
-        notifier.notify(title="Onionr Mail - New Message",
-                       message="From: %s\n\nSubject: %s" % (signer, metadata['subject']))
+        notifier.notify(title="Onionr Mail - New Message", message="From: %s\n\nSubject: %s" % (signer, metadata['subject']))
diff --git a/onionr/static-data/www/mail/index.html b/onionr/static-data/www/mail/index.html
index 8ff0ec79..e9147121 100755
--- a/onionr/static-data/www/mail/index.html
+++ b/onionr/static-data/www/mail/index.html
@@ -56,7 +56,6 @@
                     </div>
                     <div class="column is-7">
                         <div class="field">
-                            <label class="label">Open Site</label>
                             <div class="field has-addons">
                                 <p class="control">
                                     <a class="button is-static">Identity</a>
diff --git a/onionr/static-data/www/mail/mail.js b/onionr/static-data/www/mail/mail.js
index c4d4edb2..5fa58f44 100755
--- a/onionr/static-data/www/mail/mail.js
+++ b/onionr/static-data/www/mail/mail.js
@@ -322,6 +322,9 @@ function showSentboxWindow(to, content){
 }
 
 function refreshPms(callNext){
+    if (threadPart.innerText.includes("¯\\_(ツ)_/¯")){
+        threadPart.innerText = ""
+    }
     if (! window.inboxActive){
         return
     }