8 files changed, 17 insertions, 16 deletions
diff --git a/README.mediawiki b/README.mediawiki
index 1c1713e..c8431d2 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -616,13 +616,13 @@ Those proposing changes should consider that ultimately consent may rest with th
 | Christian Decker
 | Standard
 | Draft
-|-
+|- style="background-color: #ffffcf"
 | [[bip-0141.mediawiki|141]]
 | Consensus (soft fork)
 | Segregated Witness (Consensus layer)
 | Eric Lombrozo, Johnson Lau, Pieter Wuille
 | Standard
-| Draft
+| Proposed
 |- style="background-color: #ffcfcf"
 | [[bip-0142.mediawiki|142]]
 | Applications
@@ -630,20 +630,20 @@ Those proposing changes should consider that ultimately consent may rest with th
 | Johnson Lau
 | Standard
 | Withdrawn
-|-
+|- style="background-color: #ffffcf"
 | [[bip-0143.mediawiki|143]]
 | Consensus (soft fork)
 | Transaction Signature Verification for Version 0 Witness Program
 | Johnson Lau, Pieter Wuille
 | Standard
-| Draft
-|-
+| Proposed
+|- style="background-color: #ffffcf"
 | [[bip-0144.mediawiki|144]]
 | Peer Services
 | Segregated Witness (Peer Services)
 | Eric Lombrozo, Pieter Wuille
 | Standard
-| Draft
+| Proposed
 |- style="background-color: #cfffcf"
 | [[bip-0145.mediawiki|145]]
 | API/RPC
@@ -658,13 +658,13 @@ Those proposing changes should consider that ultimately consent may rest with th
 | Johnson Lau, Pieter Wuille
 | Standard
 | Draft
-|-
+|- style="background-color: #ffffcf"
 | [[bip-0147.mediawiki|147]]
 | Consensus (soft fork)
 | Dealing with dummy stack element malleability
 | Johnson Lau
 | Standard
-| Draft
+| Proposed
 |- style="background-color: #cfffcf"
 | [[bip-0148.mediawiki|148]]
 | Consensus (soft fork)
diff --git a/bip-0115.mediawiki b/bip-0115.mediawiki
index 52366ab..9432f5c 100644
--- a/bip-0115.mediawiki
+++ b/bip-0115.mediawiki
@@ -83,7 +83,7 @@ Why are block heights required to be absolute, rather than relative?
 Why are blocks older than 52596 deep in the chain not verified?
 
 * This is to avoid creating an infinite storage requirement from all full nodes which would be necessary to maintain all the block headers indefinitely. 52596 block headers requires a fixed size of approximately 4 MB.
-* In any case where you might want to specify a deeper block, you can also just as well specify a more recent one that decends from it.
+* In any case where you might want to specify a deeper block, you can also just as well specify a more recent one that descends from it.
 * It is assumed that 1 year is sufficient time to double-spend any common UTXOs on all blockchains of interest.
 * If a deeper check is needed, it can be softforked in. Making the check more shallow, on the other hand, is a hardfork.
 
diff --git a/bip-0141.mediawiki b/bip-0141.mediawiki
index b14daf4..70eb1e1 100644
--- a/bip-0141.mediawiki
+++ b/bip-0141.mediawiki
@@ -7,7 +7,7 @@
           Pieter Wuille <pieter.wuille@gmail.com>
   Comments-Summary: No comments yet.
   Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0141
-  Status: Draft
+  Status: Proposed
   Type: Standards Track
   Created: 2015-12-21
   License: PD
diff --git a/bip-0143.mediawiki b/bip-0143.mediawiki
index f3ad23d..b3d6c09 100644
--- a/bip-0143.mediawiki
+++ b/bip-0143.mediawiki
@@ -6,7 +6,7 @@
           Pieter Wuille <pieter.wuille@gmail.com>
   Comments-Summary: No comments yet.
   Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0143
-  Status: Draft
+  Status: Proposed
   Type: Standards Track
   Created: 2016-01-03
   License: PD
diff --git a/bip-0144.mediawiki b/bip-0144.mediawiki
index b96fe83..a0e88c1 100644
--- a/bip-0144.mediawiki
+++ b/bip-0144.mediawiki
@@ -6,7 +6,7 @@
           Pieter Wuille <pieter.wuille@gmail.com>
   Comments-Summary: No comments yet.
   Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0144
-  Status: Draft
+  Status: Proposed
   Type: Standards Track
   Created: 2016-01-08
   License: PD
diff --git a/bip-0147.mediawiki b/bip-0147.mediawiki
index 8a5c67a..5a85a69 100644
--- a/bip-0147.mediawiki
+++ b/bip-0147.mediawiki
@@ -5,7 +5,7 @@
   Author: Johnson Lau <jl2012@xbt.hk>
   Comments-Summary: No comments yet.
   Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0147
-  Status: Draft
+  Status: Proposed
   Type: Standards Track
   Created: 2016-09-02
   License: PD
diff --git a/bip-0152.mediawiki b/bip-0152.mediawiki
index 8ea3701..e6a3969 100644
--- a/bip-0152.mediawiki
+++ b/bip-0152.mediawiki
@@ -128,7 +128,7 @@ A new inv type (MSG_CMPCT_BLOCK == 4) and several new protocol messages are adde
 # Upon receipt of a cmpctblock message after sending a sendcmpct message, nodes SHOULD calculate the short transaction ID for each unconfirmed transaction they have available (ie in their mempool) and compare each to each short transaction ID in the cmpctblock message.
 # After finding already-available transactions, nodes which do not have all transactions available to reconstruct the full block SHOULD request the missing transactions using a getblocktxn message.
 # A node MUST NOT send a cmpctblock message unless they are able to respond to a getblocktxn message which requests every transaction in the block.
-# A node MUST NOT send a cmpctblock message without having validated that the header properly commits to each transaction in the block, and properly builds on top of the existing chain with a valid proof-of-work. A node MAY send a cmpctblock before validating that each transaction in the block validly spends existing UTXO set entries.
+# A node MUST NOT send a cmpctblock message without having validated that the header properly commits to each transaction in the block, and properly builds on top of the existing, fully-validated chain with a valid proof-of-work either as a part of the current most-work valid chain, or building directly on top of it. A node MAY send a cmpctblock before validating that each transaction in the block validly spends existing UTXO set entries.
 
 ====getblocktxn====
 # The getblocktxn message is defined as a message containing a serialized BlockTransactionsRequest message and pchCommand == "getblocktxn".
diff --git a/scripts/buildtable.pl b/scripts/buildtable.pl
index 36701a5..144ede6 100755
--- a/scripts/buildtable.pl
+++ b/scripts/buildtable.pl
@@ -19,6 +19,7 @@ my %MayHaveMulti = (
 	Author => undef,
 	'Comments-URI' => undef,
 	License => undef,
+	'License-Code' => undef,
 	'Post-History' => undef,
 );
 my %DateField = (
@@ -149,9 +150,9 @@ while (++$bipnum <= $topbip) {
 		} elsif ($field eq 'Layer') {  # BIP 123
 			die "Invalid layer $val in $fn" unless exists $ValidLayer{$val};
 			$layer = $val;
-		} elsif ($field eq 'License') {
+		} elsif ($field =~ /^License(?:\-Code)?$/) {
 			die "Undefined license $val in $fn" unless exists $DefinedLicenses{$val};
-			if (not $found{License}) {
+			if (not $found{$field}) {
 				die "Unacceptable license $val in $fn" unless exists $AcceptableLicenses{$val} or ($val eq 'PD' and exists $GrandfatheredPD{$bipnum});
 			}
 		} elsif ($field eq 'Comments-URI') {