diff --git a/.gitignore b/.gitignore
index 33eda18..58cb08f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,5 @@ stamp-h1
 # binaries
 corkscrew
 *.o
+.*.swp
+.*.swo
diff --git a/AUTHORS b/AUTHORS
index 4967a7a..8a3999e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,4 @@
 Pat Padgett <agroman@agroman.net>
 Bryan Chan <bryanpkc@gmail.com>
 Rémy Sanchez <remy@delos.ltd>
+Chad S. Lauritsen <csl4jc@gmail.com>
diff --git a/corkscrew.c b/corkscrew.c
index ebd798b..54c04fe 100644
--- a/corkscrew.c
+++ b/corkscrew.c
@@ -184,7 +184,7 @@ char *argv[];
 
 	port = 80;
 
-	if ((argc == 5) || (argc == 6)) {
+	if (argc == 5 || argc == 6) {
 		if (argc == 5) {
 			host = argv[1];
 			port = atoi(argv[2]);
@@ -192,7 +192,7 @@ char *argv[];
 			destport = argv[4];
 			up = getenv("CORKSCREW_AUTH");
 		}
-		if ((argc == 6)) {
+		if (argc == 6) {
 			host = argv[1];
 			port = atoi(argv[2]);
 			desthost = argv[3];
@@ -256,6 +256,7 @@ char *argv[];
 				if (len<=0)
 					break;
 				else {
+					memset(descr, 0, sizeof(descr));
 					sscanf(buffer,"%s%d%[^\n]",version,&code,descr);
 					if ((strncmp(version,"HTTP/",5) == 0) && (code >= 200) && (code < 300))
 						setup = 1;