diff --git a/servefile b/servefile
index 3170eb0..02796b5 100755
--- a/servefile
+++ b/servefile
@@ -638,7 +638,7 @@ def main():
 	parser.add_argument('-u', '--upload', action="store_true", default=False, \
 	                    help="Enable uploads to a given directory")
 	parser.add_argument('-s', '--max-upload-size', type=str, \
-	                    help="Limit uploadsize in kb. Size modifiers are allowed, e.g. 2G, 12Mb, 1b.")
+	                    help="Limit upload size in kB. Size modifiers are allowed, e.g. 2G, 12MB, 1B.")
 	parser.add_argument('-l', '--list-dir', action="store_true", default=False, \
 	                    help="Show directory indexes and allow access to all subdirectories")
 	parser.add_argument('--ssl', action="store_true", default=False, \
diff --git a/servefile.1 b/servefile.1
old mode 100644
new mode 100755
index 1f9cd9a..b455b1d
--- a/servefile.1
+++ b/servefile.1
@@ -11,13 +11,13 @@ servefile \- small HTTP-Server for temporary file transfer
 \fIfile/directory\fR
 
 .SH DISCLAIMER
-Do not use this as a normal webserver. This server is optimized for running
+Do not use this as a normal web server. This server is optimized for running
 a short time and to send files to other people, not for doing high-performance
 static file serving.
 
 .SH DESCRIPTION
-servefile is a small HTTP-server intended for temporary file transfer mostly
-in the local network. It aims to make transfering single files as painless as
+Servefile is a small HTTP-server intended for temporary file transfer mostly
+in the local network. It aims to make transferring single files as painless as
 possible and to replace tar/netcat solutions.
 
 With just a file as argument servefile serves just that one file and redirects
@@ -29,7 +29,7 @@ uploaded files into that directory. When uploading with curl or wget the
 filename is extracted from the path part of the url used for the upload.
 
 For SSL support python-openssl (pyssl) needs to be installed. If no key and
-cert is given, servefile will generate a keypair for you and display its
+cert is given, servefile will generate a key pair for you and display its
 fingerprint.
 
 In \fB--tar\fR mode the given file or directory will be packed on (each)
@@ -60,8 +60,8 @@ Port to listen on
 Enable uploads to a given directory
 .TP
 \fB\-s\fR MAX_UPLOAD_SIZE, \fB\-\-max\-upload\-size\fR MAX_UPLOAD_SIZE
-Limit uploadsize in kb. Size modifiers are allowed,
-e.g. 2G, 12Mb, 1b.
+Limit upload size in kB. Size modifiers are allowed,
+e.g. 2G, 12MB, 1B.
 .TP
 \fB\-l\fR, \fB\-\-list\-dir\fR
 Show directory indexes and allow access to all
@@ -72,8 +72,8 @@ Enable SSL. If no key/cert is specified one will be
 generated.
 .TP
 \fB\-\-key\fR KEY
-Keyfile to use for SSL. If no cert is given with
-\fB\-\-cert\fR the keyfile will also be searched for a cert
+Key file to use for SSL. If no cert is given with
+\fB\-\-cert\fR the key file will also be searched for a cert
 .TP
 \fB\-\-cert\fR CERT
 Certfile to use for SSL