diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5dd414e0..c66eed4c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -92,6 +92,11 @@ we see fit; this is not an insult, just a basic security precaution in case
 the account becomes inactive or abandoned. Privileges can always be restored
 later.
 
+**Reviewing pull requests:** Please help submit and review pull requests as
+you are able! We would ask that every pull request be reviewed by at least
+one collaborator who did not open the pull request before merging. This will
+help ensure high code quality as new collaborators are added to the project.
+
 
 ### Vulnerabilities
 
diff --git a/README.md b/README.md
index 39dd77bc..8882144b 100644
--- a/README.md
+++ b/README.md
@@ -82,7 +82,7 @@ Wow! Caddy can do a lot with just a few lines.
 To host multiple sites and do more with the Caddyfile, please see the
 [Caddyfile documentation](https://caddyserver.com/docs/caddyfile).
 
-Note that production sites (not localhost) are served over
+Note that production sites are served over
 [HTTPS by default](https://caddyserver.com/docs/automatic-https).
 
 Caddy has a command line interface. Run `caddy -h` to view basic help or see
diff --git a/caddyhttp/proxy/upstream.go b/caddyhttp/proxy/upstream.go
index 67ca0957..7ba33ef5 100644
--- a/caddyhttp/proxy/upstream.go
+++ b/caddyhttp/proxy/upstream.go
@@ -274,9 +274,9 @@ func parseBlock(c *caddyfile.Dispenser, u *staticUpstream) error {
 			return err
 		}
 		u.HealthCheck.Timeout = dur
-	case "header_upstream":
+	case "proxy_header": // TODO: deprecate this shortly after 0.9
 		fallthrough
-	case "proxy_header":
+	case "header_upstream":
 		var header, value string
 		if !c.Args(&header, &value) {
 			return c.ArgErr()
diff --git a/caddytls/maintain.go b/caddytls/maintain.go
index e747d858..4d01bf4e 100644
--- a/caddytls/maintain.go
+++ b/caddytls/maintain.go
@@ -106,7 +106,7 @@ func RenewManagedCertificates(allowPrompts bool) (err error) {
 					// that we used to do this any time a renewal failed at startup. However,
 					// after discussion in https://github.com/mholt/caddy/issues/642 we decided to
 					// only stop startup if the certificate is expired. We still log the error
-					// otherwise.
+					// otherwise. I'm not sure how permanent the change in #642 will be...
 					certCacheMu.RUnlock()
 					return err
 				}