diff --git a/bip-0016.mediawiki b/bip-0016.mediawiki
index 68c03547..5344469c 100644
--- a/bip-0016.mediawiki
+++ b/bip-0016.mediawiki
@@ -1,8 +1,10 @@
+{{bip}}
+
 <pre>
   BIP: 16
   Title: Pay to Script Hash
   Author: Gavin Andresen <gavinandresen@gmail.com>
-  Status: Accepted
+  Status: Final
   Type: Standards Track
   Created: 03-01-2012
 </pre>
@@ -37,7 +39,7 @@ The rules for validating these outpoints when relaying transactions or consideri
 # Normal validation is done: an initial stack is created from the signatures and {serialized script}, and the hash of the script is computed and validation fails immediately if it does not match the hash in the outpoint.
 # {serialized script} is popped off the initial stack, and the transaction is validated again using the popped stack and the deserialized script as the scriptPubKey.
 
-These same rules shall be applied when validating transactions in blocks with timestamps after February 15, 2012 (see the Backwards Compatibility section for details).
+These new rules should only be applied when validating transactions in blocks with timestamps >= 1333238400 (Apr 1 2012) <ref>[https://github.com/bitcoin/bitcoin/commit/8f188ece3c82c4cf5d52a3363e7643c23169c0ff Remove -bip16 and -paytoscripthashtime command-line arguments]</ref>. There are transaction earlier than 13333238400 in the block chain that fail these new validation rules. <ref>[http://blockexplorer.com/tx/6a26d2ecb67f27d1fa5524763b49029d7106e91e3cc05743073461a719776192 Transaction 6a26d2ecb67f27d1fa5524763b49029d7106e91e3cc05743073461a719776192]</ref>. Older transactions must be validated under the old rules. (see the Backwards Compatibility section for details).
 
 For example, the scriptPubKey and corresponding scriptSig for a one-signature-required transaction is:
 
@@ -98,11 +100,16 @@ If a majority of hashing power does not support the new validation rules, then r
 
 ==Reference Implementation==
 
-Coming Soon
+https://gist.github.com/gavinandresen/3966071
 
 ==See Also==
 
 * https://bitcointalk.org/index.php?topic=46538
 * The [[BIP 0013|Address format for Pay to Script Hash BIP]]
 * M-of-N Multisignature Transactions [[BIP 0011|BIP 11]]
+* [[BIP_0016_QA|Quality Assurance test checklist]]
 
+== References ==
+<references/>
+
+[[Category:BIP|D]]