diff --git a/bip-0002.mediawiki b/bip-0002.mediawiki
index 4fed0399..632a112f 100644
--- a/bip-0002.mediawiki
+++ b/bip-0002.mediawiki
@@ -116,7 +116,7 @@ BIPs should be written in mediawiki format.
 
 Each BIP should have the following parts:
 
-* Preamble -- Headers containing metadata about the BIP ([[#Preamble|see below]]).
+* Preamble -- Headers containing metadata about the BIP ([[#BIP header preamble|see below]]).
 
 * Abstract -- A short (~200 word) description of the technical issue being addressed.
 
@@ -137,8 +137,8 @@ Each BIP should have the following parts:
 Each BIP must begin with an RFC 822 style header preamble. The headers must appear in the following order. Headers marked with "*" are optional and are described below. All other headers are required.
 
 <pre>
-  BIP: <BIP number>
-  Title: <BIP title>
+  BIP: <BIP number, or "?" before being assigned>
+  Title: <BIP title; maximum 44 characters>
   Author: <list of authors' real names and optionally, email addrs>
 * Discussions-To: <email address>
   Status: <Draft | Active | Accepted | Deferred | Rejected |