diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ea21aeef..9f083d3d 100755
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # Contributing to Onionr
 
-One of the great things about open source projects is that they allow for many people to contribute to the project.
+One of the great things about open source projects is that they allow for anyone to contribute to the project.
 
 This file serves to provide guidelines on how to successfully contribute to Onionr.
 
diff --git a/onionr/api.py b/onionr/api.py
index 50bc83b5..66464e9b 100755
--- a/onionr/api.py
+++ b/onionr/api.py
@@ -1,5 +1,5 @@
 '''
-    Onionr - P2P Anonymous Storage Network
+    Onionr - Private P2P Communication
 
     This file handles all incoming http requests to the client, using Flask
 '''
diff --git a/onionr/blockimporter.py b/onionr/blockimporter.py
index ce1cd1fe..ccfc77db 100755
--- a/onionr/blockimporter.py
+++ b/onionr/blockimporter.py
@@ -1,5 +1,5 @@
 '''
-    Onionr - P2P Microblogging Platform & Social network
+    Onionr - Private P2P Communication
 
     Import block data and save it
 '''
diff --git a/onionr/communicator.py b/onionr/communicator.py
index 602f7277..5f31fc3c 100755
--- a/onionr/communicator.py
+++ b/onionr/communicator.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 '''
-    Onionr - P2P Anonymous Storage Network
+    Onionr - Private P2P Communication
 
     This file contains both the OnionrCommunicate class for communcating with peers
     and code to operate as a daemon, getting commands from the command queue database (see core.Core.daemonQueue)
diff --git a/onionr/communicatorutils/connectnewpeers.py b/onionr/communicatorutils/connectnewpeers.py
index 88d8151d..0ba358f6 100644
--- a/onionr/communicatorutils/connectnewpeers.py
+++ b/onionr/communicatorutils/connectnewpeers.py
@@ -1,5 +1,5 @@
 '''
-    Onionr - P2P Microblogging Platform & Social network
+    Onionr - Private P2P Communication
 
     Connect a new peer to our communicator instance. Does so randomly if no peer is specified
 '''
diff --git a/onionr/config.py b/onionr/config.py
index 5576a1d3..6cb75050 100755
--- a/onionr/config.py
+++ b/onionr/config.py
@@ -1,5 +1,5 @@
 '''
-    Onionr - P2P Microblogging Platform & Social network
+    Onionr - Private P2P Communication
 
     This file deals with configuration management.
 '''
diff --git a/onionr/core.py b/onionr/core.py
index 4246f7fe..58c95d9f 100755
--- a/onionr/core.py
+++ b/onionr/core.py
@@ -1,5 +1,5 @@
 '''
-    Onionr - P2P Anonymous Storage Network
+    Onionr - Private P2P Communication
 
     Core Onionr library, useful for external programs. Handles peer & data processing
 '''
diff --git a/onionr/dbcreator.py b/onionr/dbcreator.py
index b84794d3..6c26fa97 100755
--- a/onionr/dbcreator.py
+++ b/onionr/dbcreator.py
@@ -1,5 +1,5 @@
 '''
-    Onionr - P2P Anonymous Data Storage & Sharing
+    Onionr - Private P2P Communication
 
     DBCreator, creates sqlite3 databases used by Onionr
 '''
diff --git a/onionr/keymanager.py b/onionr/keymanager.py
index ff89401b..9e2a1703 100755
--- a/onionr/keymanager.py
+++ b/onionr/keymanager.py
@@ -1,5 +1,5 @@
 '''
-    Onionr - P2P Anonymous Storage Network
+    Onionr - Private P2P Communication
 
     Load, save, and delete the user's public key pairs (does not handle peer keys)
 '''
diff --git a/onionr/onionrcrypto.py b/onionr/onionrcrypto.py
index ddff1993..2ce90bf6 100755
--- a/onionr/onionrcrypto.py
+++ b/onionr/onionrcrypto.py
@@ -1,5 +1,5 @@
 '''
-    Onionr - P2P Anonymous Storage Network
+    Onionr - Private P2P Communication
 
     This file handles Onionr's cryptography.
 '''
diff --git a/onionr/onionrpeers.py b/onionr/onionrpeers.py
index 8a88d649..ad60d543 100755
--- a/onionr/onionrpeers.py
+++ b/onionr/onionrpeers.py
@@ -17,7 +17,8 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 '''
-import core, config, logger, sqlite3
+import sqlite3
+import core, config, logger
 class PeerProfiles:
     '''
         PeerProfiles
diff --git a/onionr/onionrproofs.py b/onionr/onionrproofs.py
index 20e10403..ac64575f 100755
--- a/onionr/onionrproofs.py
+++ b/onionr/onionrproofs.py
@@ -1,5 +1,5 @@
 '''
-    Onionr - P2P Anonymous Storage Network
+    Onionr - Private P2P Communication
 
     Proof of work module
 '''
diff --git a/onionr/onionrservices/connectionserver.py b/onionr/onionrservices/connectionserver.py
index 0878b100..e676e496 100644
--- a/onionr/onionrservices/connectionserver.py
+++ b/onionr/onionrservices/connectionserver.py
@@ -1,5 +1,5 @@
 '''
-    Onionr - P2P Anonymous Storage Network
+    Onionr - Private P2P Communication
 
     This module does the second part of the bootstrap block handshake and creates the API server
 '''
@@ -17,8 +17,7 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 '''
-import threading, time
-from gevent.pywsgi import WSGIServer, WSGIHandler
+from gevent.pywsgi import WSGIServer
 from stem.control import Controller
 from flask import Flask
 import core, logger, httpapi
diff --git a/onionr/onionrservices/serviceblocks.py b/onionr/onionrservices/serviceblocks.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/onionr/onionrutils.py b/onionr/onionrutils.py
index 31521059..824c2415 100755
--- a/onionr/onionrutils.py
+++ b/onionr/onionrutils.py
@@ -1,5 +1,5 @@
 '''
-    Onionr - P2P Microblogging Platform & Social network
+    Onionr - Private P2P Communication
 
     OnionrUtils offers various useful functions to Onionr. Relatively misc.
 '''
diff --git a/onionr/serializeddata.py b/onionr/serializeddata.py
index 3efe150a..ef58c304 100644
--- a/onionr/serializeddata.py
+++ b/onionr/serializeddata.py
@@ -1,5 +1,5 @@
 '''
-    Onionr - P2P Anonymous Storage Network
+    Onionr - Private P2P Communication
 
     This module serializes various data pieces for use in other modules, in particular the web api
 '''
diff --git a/onionr/static-data/www/friends/friends.js b/onionr/static-data/www/friends/friends.js
index 48e3fd6b..28e2a2da 100755
--- a/onionr/static-data/www/friends/friends.js
+++ b/onionr/static-data/www/friends/friends.js
@@ -1,5 +1,5 @@
 /*
-    Onionr - P2P Anonymous Storage Network
+    Onionr - Private P2P Communication
 
     This file handles the UI for managing friends/contacts
 
diff --git a/onionr/static-data/www/mail/mail.js b/onionr/static-data/www/mail/mail.js
index 1109e433..d7b62765 100644
--- a/onionr/static-data/www/mail/mail.js
+++ b/onionr/static-data/www/mail/mail.js
@@ -1,5 +1,5 @@
 /*
-    Onionr - P2P Anonymous Storage Network
+    Onionr - Private P2P Communication
 
     This file handles the mail interface
 
diff --git a/onionr/static-data/www/mail/sendmail.js b/onionr/static-data/www/mail/sendmail.js
index 704574e6..f8ff49bc 100755
--- a/onionr/static-data/www/mail/sendmail.js
+++ b/onionr/static-data/www/mail/sendmail.js
@@ -1,5 +1,5 @@
 /*
-    Onionr - P2P Anonymous Storage Network
+    Onionr - Private P2P Communication
 
     This file handles the mail interface
 
diff --git a/onionr/static-data/www/shared/configeditor.js b/onionr/static-data/www/shared/configeditor.js
index 6c9913b1..172b3d5a 100644
--- a/onionr/static-data/www/shared/configeditor.js
+++ b/onionr/static-data/www/shared/configeditor.js
@@ -1,5 +1,5 @@
 /*
-    Onionr - P2P Anonymous Storage Network
+    Onionr - Private P2P Communication
 
     This file is for configuration editing in the web interface
 
diff --git a/onionr/static-data/www/shared/misc.js b/onionr/static-data/www/shared/misc.js
index eeaddf71..ca0cb58b 100644
--- a/onionr/static-data/www/shared/misc.js
+++ b/onionr/static-data/www/shared/misc.js
@@ -1,5 +1,5 @@
 /*
-    Onionr - P2P Anonymous Storage Network
+    Onionr - Private P2P Communication
 
     This file handles the mail interface
 
diff --git a/onionr/subprocesspow.py b/onionr/subprocesspow.py
index f1b23c7f..e7b78d5f 100755
--- a/onionr/subprocesspow.py
+++ b/onionr/subprocesspow.py
@@ -1,4 +1,24 @@
 #!/usr/bin/env python3
+'''
+    Onionr - Private P2P Communication
+
+    Multiprocess proof of work
+'''
+'''
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+'''
+
 import subprocess, os
 import multiprocessing, threading, time, json
 from multiprocessing import Pipe, Process