diff --git a/evaluator/evaluator.go b/evaluator/evaluator.go
index 5b929a2..497254d 100644
--- a/evaluator/evaluator.go
+++ b/evaluator/evaluator.go
@@ -1,3 +1,4 @@
+// Package evaluator is an interim internal package that forwards to package values.
 package evaluator
 
 import (
diff --git a/expressions/expressions.go b/expressions/expressions.go
index 5d3f3cd..61d98b6 100644
--- a/expressions/expressions.go
+++ b/expressions/expressions.go
@@ -1,4 +1,4 @@
-// Package expressions parses and evaluates the expression language.
+// Package expressions is an internal package that parses and evaluates the expression language.
 //
 // This is the language that is used inside Liquid object and tags; e.g. "a.b[c]" in {{ a.b[c] }}, and "pages = site.pages | reverse" in {% assign pages = site.pages | reverse %}.
 package expressions
diff --git a/filters/standard_filters.go b/filters/standard_filters.go
index 4890852..493aa90 100644
--- a/filters/standard_filters.go
+++ b/filters/standard_filters.go
@@ -1,4 +1,4 @@
-// Package filters defines the standard Liquid filters.
+// Package filters is an internal package that defines the standard Liquid filters.
 package filters
 
 import (
diff --git a/parser/parser.go b/parser/parser.go
index c62531d..9211a15 100644
--- a/parser/parser.go
+++ b/parser/parser.go
@@ -1,4 +1,4 @@
-// Package parser parses template source into an abstract syntax tree.
+// Package parser is an internal package that parses template source into an abstract syntax tree.
 package parser
 
 import (
diff --git a/render/render.go b/render/render.go
index 11fc96d..b4ef81c 100644
--- a/render/render.go
+++ b/render/render.go
@@ -1,4 +1,4 @@
-// Package render renders a compiled template parse tree.
+// Package render is an internal package that renders a compiled template parse tree.
 package render
 
 import (
diff --git a/strftime/strftime.go b/strftime/strftime.go
index b337fe5..977ac06 100644
--- a/strftime/strftime.go
+++ b/strftime/strftime.go
@@ -1,4 +1,4 @@
-// Package strftime wraps the C stdlib strftime and strptime functions.
+// Package strftime implements a Strftime function that is compatible with Ruby's Time.strftime.
 package strftime
 
 import (
@@ -10,7 +10,7 @@ import (
 	"unicode/utf8"
 )
 
-// Strftime clones Ruby's Time.strftime
+// Strftime is compatible with Ruby's Time.strftime.
 func Strftime(format string, t time.Time) (string, error) {
 	return re.ReplaceAllStringFunc(format, func(directive string) string {
 		var (
diff --git a/tags/standard_tags.go b/tags/standard_tags.go
index 6269a2f..38b3e5a 100644
--- a/tags/standard_tags.go
+++ b/tags/standard_tags.go
@@ -1,4 +1,4 @@
-// Package tags defines the standard Liquid tags.
+// Package tags is an internal package that defines the standard Liquid tags.
 package tags
 
 import (
diff --git a/values/docs.go b/values/docs.go
index 53bb3d1..4dfe7e1 100644
--- a/values/docs.go
+++ b/values/docs.go
@@ -1,9 +1,8 @@
-package values
-
-// Package evaluator defines methods such as sorting, comparison, and type conversion, that apply to interface types.
+// Package values is an internal package that defines methods such as sorting, comparison, and type conversion, that apply to interface types.
 //
 // It is similar to, and makes heavy use of, the reflect package.
 //
 // Since the intent is to provide runtime services for the Liquid expression interpreter,
 // this package does not implement "generic" generics.
 // It attempts to implement Liquid semantics (which are largely Ruby semantics).
+package values