diff --git a/cert.go b/cert.go
index 44276da..39d7f52 100644
--- a/cert.go
+++ b/cert.go
@@ -98,10 +98,11 @@ func NewRawCertificate(host string, duration time.Duration) (crt, key []byte, er
 	return
 }
 
-// WriteCertificate writes the provided certificate and private key to name.crt + name.key
-func WriteCertificate(name string, crt, key []byte) error {
+// WriteCertificate writes the provided certificate and private key
+// to path.crt and path.key respectively.
+func WriteCertificate(path string, crt, key []byte) error {
 	// Write the certificate
-	crtPath := name + ".crt"
+	crtPath := path + ".crt"
 	crtOut, err := os.OpenFile(crtPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
 	if err != nil {
 		return err
@@ -111,7 +112,7 @@ func WriteCertificate(name string, crt, key []byte) error {
 	}
 
 	// Write the private key
-	keyPath := name + ".key"
+	keyPath := path + ".key"
 	keyOut, err := os.OpenFile(keyPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
 	if err != nil {
 		return err
diff --git a/server.go b/server.go
index ac7e366..dd1a76e 100644
--- a/server.go
+++ b/server.go
@@ -311,8 +311,8 @@ func CertificateNotAuthorized(rw *ResponseWriter, req *Request) {
 	rw.WriteHeader(StatusCertificateNotAuthorized, "Certificate not authorized")
 }
 
-// WithCertificate responds with CertificateRequired if the client did not
-// provide a certificate, and calls f with the first ceritificate if they did.
+// WithCertificate either responds with CertificateRequired if the client did
+// not provide a certificate, or calls f with the first ceritificate provided.
 func WithCertificate(rw *ResponseWriter, req *Request, f func(*x509.Certificate)) {
 	if len(req.TLS.PeerCertificates) == 0 {
 		CertificateRequired(rw, req)