diff --git a/metadata/template b/metadata/template
index ff033ae63d..57cc2905a4 100644
--- a/metadata/template
+++ b/metadata/template
@@ -1,18 +1,18 @@
 ## See http://f-droid.org/manual for details
-## Delete fields that are not needed
+## Delete fields for which no value is provided
 ## Blank lines are customary as they are seen here 
 # 
 # Only used for making an app disappear from the index
 Disabled:
 # Only changes the name in the index. Not generally required
 Name:
-# Hard-coded in the client/web repository. Separate values with a ";"
+# Possible values are hard-coded in the F-Droid source code: separate with a ";"
 AntiFeatures:
 # Not hard-coded but look at the pre-existing ones. Separate with a ";"
 Category:
-# The overall license: must be compatible with licenses of components
+# The ''overall'' license: must be compatible with licenses of components
 License:
-# Leave blank if the same as Source Code
+# Only use if different from Source Code
 Web Site:
 # Should be http(s)://
 Source Code:
@@ -44,7 +44,7 @@ Requires root: No. The app can reboot the phone if it is allowed root.
 Anti-features: Tracking and Network Services. The app uploads usage statistics
 periodically to a server whose location is hard-coded into the app.
 
-Status: Last version; still in BETA.
+Status: Last version; BETA.
 
 [https://github.com/k9mail/k-9/raw/master/res/raw/changelog.xml Changelog]
 .
@@ -52,12 +52,13 @@ Status: Last version; still in BETA.
 # Yes is the only possible value
 Requires Root:
 
-## These next three only apply to apps with source-built versions
+## These next four only apply to apps with source-built versions
 Repo Type:
 Repo:
-# Version Names and Codes must be distinct
+# Versions/Codes of each line must be different from the others
 # Any jars or prebuilts should have references, preferably in the README
 Build Version:
+Build Version:
 
 # Comments on what to watch out for when adding new Build Versions (BVs) go here
 # This field is best used at the discretion of the repo maintainers
@@ -67,8 +68,8 @@ Auto Update Mode:
 # Tags and RepoManifest (RM) are automatic but check that the mechanism works
 # Use Static if you plan to let the maintainers know in person (so to speak)
 Update Check Mode:
-# These two are usually in the AndroidManifest.xml, but can be automatically
-# updated according to value of the previous field
+# These two values are usually in the AndroidManifest.xml, but can be automatically
+# updated according to the value of the previous field
 Current Version:
 Current Version Code: