diff --git a/Makefile b/Makefile
index f1e1abb98..1ebdcfc01 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-#  Copyright(C) 2006
+#  Copyright(C) 2006 Cameron Rich
 #
 #  This license is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU Lesser General Public License as published by
diff --git a/bindings/Makefile b/bindings/Makefile
index 8f1fc8859..322b37080 100644
--- a/bindings/Makefile
+++ b/bindings/Makefile
@@ -1,5 +1,5 @@
 #
-#  Copyright(C) 2006
+#  Copyright(C) 2006 Cameron Rich
 #
 #  This library is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU Lesser General Public License as published by
diff --git a/bindings/csharp/Makefile b/bindings/csharp/Makefile
index d7fbdb619..87073f5e4 100644
--- a/bindings/csharp/Makefile
+++ b/bindings/csharp/Makefile
@@ -1,5 +1,5 @@
 #
-#  Copyright(C) 2006
+#  Copyright(C) 2006 Cameron Rich
 #
 #  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
diff --git a/bindings/csharp/axTLS.cs b/bindings/csharp/axTLS.cs
index 4622dc553..5239cd688 100644
--- a/bindings/csharp/axTLS.cs
+++ b/bindings/csharp/axTLS.cs
@@ -1,5 +1,5 @@
 /*
- *  Copyright(C) 2006 
+ *  Copyright(C) 2006 Cameron Rich
  *
  *  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
diff --git a/bindings/generate_SWIG_interface.pl b/bindings/generate_SWIG_interface.pl
index c4a98ffce..dea277e6e 100755
--- a/bindings/generate_SWIG_interface.pl
+++ b/bindings/generate_SWIG_interface.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 #
-#  Copyright(C) 2006
+#  Copyright(C) 2006 Cameron Rich
 #
 #  This library is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU Lesser General Public License as published by
diff --git a/bindings/generate_interface.pl b/bindings/generate_interface.pl
index 067dead21..4f0fc25fa 100755
--- a/bindings/generate_interface.pl
+++ b/bindings/generate_interface.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 #
-#  Copyright(C) 2006
+#  Copyright(C) 2006 Cameron Rich
 #
 #  This library is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU Lesser General Public License as published by
diff --git a/bindings/java/Makefile b/bindings/java/Makefile
index 7e69aef52..a1933b92f 100644
--- a/bindings/java/Makefile
+++ b/bindings/java/Makefile
@@ -1,5 +1,5 @@
 #
-#  Copyright(C) 2006
+#  Copyright(C) 2006 Cameron Rich
 #
 #  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
diff --git a/bindings/java/SSL.java b/bindings/java/SSL.java
index 9d6420630..53ddd95a2 100644
--- a/bindings/java/SSL.java
+++ b/bindings/java/SSL.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright(C) 2006
+ *  Copyright(C) 2006 Cameron Rich
  *
  *  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
diff --git a/bindings/java/SSLCTX.java b/bindings/java/SSLCTX.java
index dfd08ec95..34bd9e48c 100644
--- a/bindings/java/SSLCTX.java
+++ b/bindings/java/SSLCTX.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright(C) 2006
+ *  Copyright(C) 2006 Cameron Rich
  *
  *  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
diff --git a/bindings/java/SSLClient.java b/bindings/java/SSLClient.java
index ef624d60d..02ad38c7d 100644
--- a/bindings/java/SSLClient.java
+++ b/bindings/java/SSLClient.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright(C) 2006
+ *  Copyright(C) 2006 Cameron Rich
  *
  *  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
diff --git a/bindings/java/SSLReadHolder.java b/bindings/java/SSLReadHolder.java
index 0749ab3e8..e51e0a593 100644
--- a/bindings/java/SSLReadHolder.java
+++ b/bindings/java/SSLReadHolder.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright(C) 2006
+ *  Copyright(C) 2006 Cameron Rich
  *
  *  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
diff --git a/bindings/java/SSLServer.java b/bindings/java/SSLServer.java
index 6f4cf00e8..7aa7fc09b 100644
--- a/bindings/java/SSLServer.java
+++ b/bindings/java/SSLServer.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright(C) 2006
+ *  Copyright(C) 2006 Cameron Rich
  *
  *  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
diff --git a/bindings/java/SSLUtil.java b/bindings/java/SSLUtil.java
index 26451b20a..d5b6ba9f2 100644
--- a/bindings/java/SSLUtil.java
+++ b/bindings/java/SSLUtil.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright(C) 2006
+ *  Copyright(C) 2006 Cameron Rich
  *
  *  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
diff --git a/bindings/perl/Makefile b/bindings/perl/Makefile
index b1943a476..e04bd3c7d 100644
--- a/bindings/perl/Makefile
+++ b/bindings/perl/Makefile
@@ -1,5 +1,5 @@
 #
-#  Copyright(C) 2006
+#  Copyright(C) 2006 Cameron Rich
 #
 #  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
diff --git a/bindings/vbnet/Makefile b/bindings/vbnet/Makefile
index 5c7a36d6a..bcd6cae4d 100644
--- a/bindings/vbnet/Makefile
+++ b/bindings/vbnet/Makefile
@@ -1,5 +1,5 @@
 #
-#  Copyright(C) 2006
+#  Copyright(C) 2006 Cameron Rich
 #
 #  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
diff --git a/bindings/vbnet/axTLSvb.vb b/bindings/vbnet/axTLSvb.vb
index 7f0819525..c07258df4 100644
--- a/bindings/vbnet/axTLSvb.vb
+++ b/bindings/vbnet/axTLSvb.vb
@@ -1,5 +1,5 @@
 '
-'  Copyright(C) 2006
+'  Copyright(C) 2006 Cameron Rich
 '
 '  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
diff --git a/config/makefile.conf b/config/makefile.conf
index 713d00c59..41e66702f 100644
--- a/config/makefile.conf
+++ b/config/makefile.conf
@@ -1,5 +1,5 @@
 #
-#  Copyright(C) 2006
+#  Copyright(C) 2006 Cameron Rich
 #
 #  This library is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU Lesser General Public License as published by
diff --git a/config/makefile.dotnet.conf b/config/makefile.dotnet.conf
index 23baf70c5..110e27d3b 100644
--- a/config/makefile.dotnet.conf
+++ b/config/makefile.dotnet.conf
@@ -1,5 +1,5 @@
 #
-#  Copyright(C) 2006
+#  Copyright(C) 2006 Cameron Rich
 #
 #  This library is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU Lesser General Public License as published by
diff --git a/config/makefile.java.conf b/config/makefile.java.conf
index 59bde8613..2194ef44b 100644
--- a/config/makefile.java.conf
+++ b/config/makefile.java.conf
@@ -1,5 +1,5 @@
 #
-#  Copyright(C) 2006
+#  Copyright(C) 2006 Cameron Rich
 #
 #  This library is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU Lesser General Public License as published by
diff --git a/docsrc/Makefile b/docsrc/Makefile
index a9a1e502c..136264b08 100644
--- a/docsrc/Makefile
+++ b/docsrc/Makefile
@@ -1,5 +1,5 @@
 #
-#  Copyright(C) 2006
+#  Copyright(C) 2006 Cameron Rich
 #
 #  This library is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU Lesser General Public License as published by
diff --git a/httpd/Makefile b/httpd/Makefile
index 07261a52c..22b8d0ff2 100644
--- a/httpd/Makefile
+++ b/httpd/Makefile
@@ -1,5 +1,5 @@
 #
-#  Copyright(C) 2006
+#  Copyright(C) 2006 Cameron Rich
 #
 #  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
diff --git a/samples/Makefile b/samples/Makefile
index 4a7acd786..fbb31149a 100644
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -1,5 +1,5 @@
 #
-#  Copyright(C) 2006
+#  Copyright(C) 2006 Cameron Rich
 #
 #  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
diff --git a/samples/c/Makefile b/samples/c/Makefile
index c941f781d..0ab81e70f 100644
--- a/samples/c/Makefile
+++ b/samples/c/Makefile
@@ -1,5 +1,5 @@
 #
-#  Copyright(C) 2006
+#  Copyright(C) 2006 Cameron Rich
 #
 #  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
diff --git a/samples/c/axssl.c b/samples/c/axssl.c
index 955340ca8..7575c263b 100644
--- a/samples/c/axssl.c
+++ b/samples/c/axssl.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright(C) 2006
+ *  Copyright(C) 2006 Cameron Rich
  *
  *  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
@@ -17,8 +17,6 @@
  */
 
 /**
- * @file axssl.c
- *
  * Demonstrate the use of the axTLS library in C with a set of 
  * command-line parameters similar to openssl. In fact, openssl clients 
  * should be able to communicate with axTLS servers and visa-versa.
diff --git a/samples/csharp/Makefile b/samples/csharp/Makefile
index d30b37c26..267a49d15 100644
--- a/samples/csharp/Makefile
+++ b/samples/csharp/Makefile
@@ -1,5 +1,5 @@
 #
-#  Copyright(C) 2006
+#  Copyright(C) 2006 Cameron Rich
 #
 #  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
diff --git a/samples/csharp/axssl.cs b/samples/csharp/axssl.cs
index ca8281d65..eb8014653 100644
--- a/samples/csharp/axssl.cs
+++ b/samples/csharp/axssl.cs
@@ -1,5 +1,5 @@
 /*
- *  Copyright(C) 2006
+ *  Copyright(C) 2006 Cameron Rich
  *
  *  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
@@ -17,8 +17,6 @@
  */
 
 /**
- * axssl.cs
- *
  * Demonstrate the use of the axTLS library in C# with a set of 
  * command-line parameters similar to openssl. In fact, openssl clients 
  * should be able to communicate with axTLS servers and visa-versa.
diff --git a/samples/java/Makefile b/samples/java/Makefile
index e8b835102..eca097ec7 100644
--- a/samples/java/Makefile
+++ b/samples/java/Makefile
@@ -1,5 +1,5 @@
 #
-#  Copyright(C) 2006
+#  Copyright(C) 2006 Cameron Rich
 #
 #  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
diff --git a/samples/java/axssl.java b/samples/java/axssl.java
index b193725ef..3d138c6cf 100644
--- a/samples/java/axssl.java
+++ b/samples/java/axssl.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright(C) 2006
+ *  Copyright(C) 2006 Cameron Rich
  *
  *  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
@@ -17,8 +17,6 @@
  */
 
 /*
- * axssl.java
- *
  * Demonstrate the use of the axTLS library in Java with a set of 
  * command-line parameters similar to openssl. In fact, openssl clients 
  * should be able to communicate with axTLS servers and visa-versa.  *
diff --git a/samples/perl/Makefile b/samples/perl/Makefile
index 0599196c4..0ad96070f 100644
--- a/samples/perl/Makefile
+++ b/samples/perl/Makefile
@@ -1,5 +1,5 @@
 #
-#  Copyright(C) 2006
+#  Copyright(C) 2006 Cameron Rich
 #
 #  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
diff --git a/samples/perl/axssl.pl b/samples/perl/axssl.pl
index ce0266b02..562d4747c 100755
--- a/samples/perl/axssl.pl
+++ b/samples/perl/axssl.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-#  Copyright(C) 2006
+#  Copyright(C) 2006 Cameron Rich
 #
 #  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
@@ -17,8 +17,6 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-#
-# axssl.pl
 #
 # Demonstrate the use of the axTLS library in Perl with a set of 
 # command-line parameters similar to openssl. In fact, openssl clients 
diff --git a/samples/vbnet/Makefile b/samples/vbnet/Makefile
index 9f9adc66c..7349e67cc 100644
--- a/samples/vbnet/Makefile
+++ b/samples/vbnet/Makefile
@@ -1,5 +1,5 @@
 #
-#  Copyright(C) 2006
+#  Copyright(C) 2006 Cameron Rich
 #
 #  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
diff --git a/samples/vbnet/axssl.vb b/samples/vbnet/axssl.vb
index 4eb210a3f..ce64db5e8 100644
--- a/samples/vbnet/axssl.vb
+++ b/samples/vbnet/axssl.vb
@@ -1,5 +1,5 @@
 '
-'  Copyright(C) 2006
+'  Copyright(C) 2006 Cameron Rich
 '
 '  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
@@ -16,8 +16,6 @@
 '  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 '
 
-'
-' @file axssl.vb
 '
 ' Demonstrate the use of the axTLS library in VB.NET with a set of 
 ' command-line parameters similar to openssl. In fact, openssl clients 
diff --git a/ssl/Makefile b/ssl/Makefile
index 14d50ac93..61864a5b7 100644
--- a/ssl/Makefile
+++ b/ssl/Makefile
@@ -1,5 +1,5 @@
 #
-#  Copyright(C) 2006
+#  Copyright(C) 2006 Cameron Rich
 #
 #  This library is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU Lesser General Public License as published by
diff --git a/ssl/aes.c b/ssl/aes.c
index 74e8b666e..8aefbf4f6 100644
--- a/ssl/aes.c
+++ b/ssl/aes.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright(C) 2006
+ *  Copyright(C) 2006 Cameron Rich
  *
  *  This library is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
diff --git a/ssl/asn1.c b/ssl/asn1.c
index 487d848fb..44d2adf09 100644
--- a/ssl/asn1.c
+++ b/ssl/asn1.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright(C) 2006
+ *  Copyright(C) 2006 Cameron Rich
  *
  *  This library is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
diff --git a/ssl/bigint.c b/ssl/bigint.c
index 41446dde6..24e6a53f8 100644
--- a/ssl/bigint.c
+++ b/ssl/bigint.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright(C) 2006
+ *  Copyright(C) 2006 Cameron Rich
  *
  *  This library is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
@@ -423,7 +423,7 @@ bigint *bi_divide(BI_CTX *ctx, bigint *u, bigint *v, int is_mod)
 
         if (v->size > 1 && V2)
         {
-            /* we are implementing the following
+            /* we are implementing the following:
             if (V2*q_dash > (((U(0)*COMP_RADIX + U(1) - 
                     q_dash*V1)*COMP_RADIX) + U(2))) ... */
             comp inner = (comp)((long_comp)COMP_RADIX*U(0) + U(1) - 
@@ -449,6 +449,7 @@ bigint *bi_divide(BI_CTX *ctx, bigint *u, bigint *v, int is_mod)
             {
                 Q(j)--;
                 tmp_u = bi_add(ctx, tmp_u, bi_copy(v));
+
                 /* lop off the carry */
                 tmp_u->size--;
                 v->size--;
@@ -478,7 +479,7 @@ bigint *bi_divide(BI_CTX *ctx, bigint *u, bigint *v, int is_mod)
     }
 }
 
-/**
+/*
  * Perform an integer divide on a bigint.
  */
 static bigint *bi_int_divide(BI_CTX *ctx, bigint *biR, comp denom)
@@ -715,7 +716,7 @@ void bi_export(BI_CTX *ctx, bigint *x, uint8_t *data, int size)
  * @param ctx [in]  The bigint session context.
  * @param bim [in]  The bigint modulus that will be used.
  * @param mod_offset [in] There are three moduluii that can be stored - the
- * standard modulus, and it's two primes p and q. This offset refers to which
+ * standard modulus, and its two primes p and q. This offset refers to which
  * modulus we are referring to.
  * @see bi_free_mod(), bi_mod_power().
  */
@@ -898,7 +899,7 @@ bigint *bi_multiply(BI_CTX *ctx, bigint *bia, bigint *bib)
 
 #ifdef CONFIG_BIGINT_SQUARE
 /*
- * Perform the actual square operion. It takes into account overflow 
+ * Perform the actual square operion. It takes into account overflow.
  */
 static bigint *regular_square(BI_CTX *ctx, bigint *bi)
 {
@@ -940,6 +941,7 @@ static bigint *regular_square(BI_CTX *ctx, bigint *bi)
         }
 
         w[i+t] += carry;
+
         if (u)
         {
             w[i+t+1] = 1;   /* add carry */
@@ -1018,7 +1020,7 @@ int bi_compare(bigint *bia, bigint *bib)
     return r;
 }
 
-/**
+/*
  * Allocate and zero more components.  Does not consume bi. 
  */
 static void more_comps(bigint *bi, int n)
@@ -1051,6 +1053,7 @@ static bigint *alloc(BI_CTX *ctx, int size)
         biR = ctx->free_list;
         ctx->free_list = biR->next;
         ctx->free_count--;
+
         if (biR->refs != 0)
         {
 #ifdef CONFIG_SSL_FULL_MODE
@@ -1338,8 +1341,7 @@ bigint *bi_barrett(BI_CTX *ctx, bigint *bi)
  */
 static void precompute_slide_window(BI_CTX *ctx, int window, bigint *g1)
 {
-    int k = 1;
-    int i;
+    int k = 1, i;
     bigint *g2;
 
     for (i = 0; i < window-1; i++)   /* compute 2^(window-1) */
@@ -1354,8 +1356,7 @@ static void precompute_slide_window(BI_CTX *ctx, int window, bigint *g1)
 
     for (i = 1; i < k; i++)
     {
-        ctx->g[i] = bi_residue(ctx, bi_multiply(ctx, ctx->g[i-1], 
-                    bi_copy(g2)));
+        ctx->g[i] = bi_residue(ctx, bi_multiply(ctx, ctx->g[i-1], bi_copy(g2)));
         bi_permanent(ctx->g[i]);
     }
 
@@ -1442,8 +1443,7 @@ bigint *bi_mod_power(BI_CTX *ctx, bigint *bi, bigint *biexp)
             }
 
             part_exp = (part_exp-1)/2;  /* adjust for array */
-            biR = bi_residue(ctx, 
-                    bi_multiply(ctx, biR, ctx->g[part_exp]));
+            biR = bi_residue(ctx, bi_multiply(ctx, biR, ctx->g[part_exp]));
             i = l-1;
         }
         else    /* square it */
diff --git a/ssl/bigint.h b/ssl/bigint.h
index db3d112b9..e233d7980 100644
--- a/ssl/bigint.h
+++ b/ssl/bigint.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright(C) 2006
+ *  Copyright(C) 2006 Cameron Rich
  *
  *  This library is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
diff --git a/ssl/bigint_impl.h b/ssl/bigint_impl.h
index 9d4818286..156e94054 100644
--- a/ssl/bigint_impl.h
+++ b/ssl/bigint_impl.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright(C) 2006
+ *  Copyright(C) 2006 Cameron Rich
  *
  *  This library is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
diff --git a/ssl/crypto.h b/ssl/crypto.h
index dae5a5f3a..f6277adcc 100644
--- a/ssl/crypto.h
+++ b/ssl/crypto.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright(C) 2006
+ *  Copyright(C) 2006 Cameron Rich
  *
  *  This library is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
diff --git a/ssl/crypto_misc.c b/ssl/crypto_misc.c
index edfe5bb7c..fa3f09390 100644
--- a/ssl/crypto_misc.c
+++ b/ssl/crypto_misc.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright(C) 2006
+ *  Copyright(C) 2006 Cameron Rich
  *
  *  This library is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
diff --git a/ssl/hmac.c b/ssl/hmac.c
index cafb2642a..aaa499dd2 100644
--- a/ssl/hmac.c
+++ b/ssl/hmac.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright(C) 2006
+ *  Copyright(C) 2006 Cameron Rich
  *
  *  This library is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
diff --git a/ssl/loader.c b/ssl/loader.c
index 400847b85..c8b74f3b2 100644
--- a/ssl/loader.c
+++ b/ssl/loader.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright(C) 2006
+ *  Copyright(C) 2006 Cameron Rich
  *
  *  This library is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
diff --git a/ssl/md5.c b/ssl/md5.c
index c682e11ea..f2a2ded67 100644
--- a/ssl/md5.c
+++ b/ssl/md5.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright(C) 2006
+ *  Copyright(C) 2006 Cameron Rich
  *
  *  This library is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
diff --git a/ssl/os_port.c b/ssl/os_port.c
index 19932293e..56e6e3a06 100644
--- a/ssl/os_port.c
+++ b/ssl/os_port.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright(C) 2006
+ *  Copyright(C) 2006 Cameron Rich
  *
  *  This library is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
diff --git a/ssl/os_port.h b/ssl/os_port.h
index b8354cb6c..fd9f83929 100644
--- a/ssl/os_port.h
+++ b/ssl/os_port.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright(C) 2006
+ *  Copyright(C) 2006 Cameron Rich
  *
  *  This library is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
diff --git a/ssl/p12.c b/ssl/p12.c
index a74bdbf28..4f37d08bc 100644
--- a/ssl/p12.c
+++ b/ssl/p12.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright(C) 2006
+ *  Copyright(C) 2006 Cameron Rich
  *
  *  This library is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
diff --git a/ssl/rc4.c b/ssl/rc4.c
index acb5f14f2..661d027c9 100644
--- a/ssl/rc4.c
+++ b/ssl/rc4.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright(C) 2006
+ *  Copyright(C) 2006 Cameron Rich
  *
  *  This library is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
diff --git a/ssl/rsa.c b/ssl/rsa.c
index f401cf285..60b36891f 100644
--- a/ssl/rsa.c
+++ b/ssl/rsa.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright(C) 2006
+ *  Copyright(C) 2006 Cameron Rich
  *
  *  This library is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
@@ -17,8 +17,6 @@
  */
 
 /**
- * @file rsa.c
- *
  * Implements the RSA public encryption algorithm. Uses the bigint library to
  * perform its calculations.
  */
@@ -68,8 +66,6 @@ void RSA_priv_key_new(RSA_CTX **ctx,
 #endif
 }
 
-/**
- */
 void RSA_pub_key_new(RSA_CTX **ctx, 
         const uint8_t *modulus, int mod_len,
         const uint8_t *pub_exp, int pub_len)
@@ -122,7 +118,6 @@ void RSA_free(RSA_CTX *rsa_ctx)
 }
 
 /**
- * @fn int RSA_decrypt(RSA_CTX *ctx, const uint8_t *in_data, uint8_t *out_data)
  * @brief Use PKCS1.5 for decryption/verification.
  * @param ctx [in] The context
  * @param in_data [in] The data to encrypt (must be < modulus size-11)
@@ -145,7 +140,7 @@ int RSA_decrypt(RSA_CTX *ctx, const uint8_t *in_data, uint8_t *out_data,
     dat_bi = bi_import(ctx->bi_ctx, in_data, byte_size);
 #ifdef CONFIG_SSL_CERT_VERIFICATION
     decrypted_bi = is_decryption ?  /* decrypt or verify? */
-        RSA_private(ctx, dat_bi) : RSA_public(ctx, dat_bi);
+            RSA_private(ctx, dat_bi) : RSA_public(ctx, dat_bi);
 #else   /* always a decryption */
     decrypted_bi = RSA_private(ctx, dat_bi);
 #endif
@@ -183,7 +178,6 @@ int RSA_decrypt(RSA_CTX *ctx, const uint8_t *in_data, uint8_t *out_data,
 }
 
 /**
- * @fn bigint *RSA_private(RSA_CTX *c, bigint *bi_msg)
  * Performs m = c^d mod n
  */
 bigint *RSA_private(RSA_CTX *c, bigint *bi_msg)
diff --git a/ssl/sha1.c b/ssl/sha1.c
index 1f0673235..80f311b18 100644
--- a/ssl/sha1.c
+++ b/ssl/sha1.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright(C) 2006
+ *  Copyright(C) 2006 Cameron Rich
  *
  *  This library is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
diff --git a/ssl/ssl.h b/ssl/ssl.h
index c314cbc8d..6c939c1f2 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright(C) 2006
+ *  Copyright(C) 2006 Cameron Rich
  *
  *  This library is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
diff --git a/ssl/test/Makefile b/ssl/test/Makefile
index 6420503b9..43c9a6cef 100644
--- a/ssl/test/Makefile
+++ b/ssl/test/Makefile
@@ -1,5 +1,5 @@
 #
-#  Copyright(C) 2006
+#  Copyright(C) 2006 Cameron Rich
 #
 #  This library is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU Lesser General Public License as published by
diff --git a/ssl/test/make_certs.sh b/ssl/test/make_certs.sh
index f0d609580..b7a872b98 100755
--- a/ssl/test/make_certs.sh
+++ b/ssl/test/make_certs.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-#  Copyright(C) 2006
+#  Copyright(C) 2006 Cameron Rich
 #
 #  This license is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU Lesser General Public License as published by
diff --git a/ssl/test/perf_bigint.c b/ssl/test/perf_bigint.c
index 4fc77fecb..74844a5e0 100644
--- a/ssl/test/perf_bigint.c
+++ b/ssl/test/perf_bigint.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright(C) 2006
+ *  Copyright(C) 2006 Cameron Rich
  *
  *  This library is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
@@ -17,8 +17,6 @@
  */
 
 /**
- * @file perf_bigint.c
- *
  * Some performance testing of bigint.
  */
 
diff --git a/ssl/test/ssltest.c b/ssl/test/ssltest.c
index 688e203f0..7bbb58e0f 100644
--- a/ssl/test/ssltest.c
+++ b/ssl/test/ssltest.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright(C) 2006
+ *  Copyright(C) 2006 Cameron Rich
  *
  *  This license is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
@@ -17,8 +17,6 @@
  */
 
 /*
- * ssltest.c
- *
  * The testing of the crypto and ssl stuff goes here. Keeps the individual code
  * modules from being uncluttered with test code.
  *
diff --git a/ssl/test/test_axssl.sh b/ssl/test/test_axssl.sh
index 7a7003365..072ffd0cb 100755
--- a/ssl/test/test_axssl.sh
+++ b/ssl/test/test_axssl.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-#  Copyright(C) 2006
+#  Copyright(C) 2006 Cameron Rich
 #
 #  This license is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU Lesser General Public License as published by
diff --git a/ssl/tls1.c b/ssl/tls1.c
index e157147a7..4aa6cbfa9 100644
--- a/ssl/tls1.c
+++ b/ssl/tls1.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright(C) 2006
+ *  Copyright(C) 2006 Cameron Rich
  *
  *  This library is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
diff --git a/ssl/tls1.h b/ssl/tls1.h
index 9f611f775..fc343e512 100644
--- a/ssl/tls1.h
+++ b/ssl/tls1.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright(C) 2006
+ *  Copyright(C) 2006 Cameron Rich
  *
  *  This library is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
diff --git a/ssl/tls1_clnt.c b/ssl/tls1_clnt.c
index 45d4bca5c..da6034be2 100644
--- a/ssl/tls1_clnt.c
+++ b/ssl/tls1_clnt.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright(C) 2006
+ *  Copyright(C) 2006 Cameron Rich
  *
  *  This library is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
diff --git a/ssl/tls1_svr.c b/ssl/tls1_svr.c
index 9449b8b45..b3505c266 100644
--- a/ssl/tls1_svr.c
+++ b/ssl/tls1_svr.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright(C) 2006
+ *  Copyright(C) 2006 Cameron Rich
  *
  *  This library is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by