diff --git a/CHANGES b/CHANGES
index 037908c2..09f0dc35 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,6 @@
 ============================================================================
-User visible changes for btcd
-  A full-node bitcoin implementation written in Go
+User visible changes for dcrd
+  A full-node decred implementation written in Go
 ============================================================================
 
 Changes in 0.11.1 (Wed May 27 2015)
@@ -44,7 +44,7 @@ Changes in 0.11.0 (Wed May 06 2015)
       forking from the network on non-standard transactions (#425)
     - Add a new checkpoint at block height 352940 (#418)
     - Optimized script execution (#395, #400, #404, #409)
-    - Fix a case that could lead stalled syncs (#138, #296) 
+    - Fix a case that could lead stalled syncs (#138, #296)
   - Network address manager changes:
     - Implement eclipse attack countermeasures as proposed in
       http://cs-people.bu.edu/heilman/eclipse (#370, #373)
@@ -513,7 +513,7 @@ Changes in 0.7.0 (Thu Feb 20 2014)
     - Add getnetworkhashps command
     - Add gettransaction command (wallet-specific)
     - Add signmessage command (wallet-specific)
-    - Update getwork command to accept 
+    - Update getwork command to accept
   - Continue cleanup and work on implementing the RPC API:
     - Implement getnettotals command
       (https://github.com/conformal/btcd/issues/84)
diff --git a/docs/code_contribution_guidelines.md b/docs/code_contribution_guidelines.md
index a08f449b..f99becd7 100644
--- a/docs/code_contribution_guidelines.md
+++ b/docs/code_contribution_guidelines.md
@@ -67,7 +67,7 @@ security and performance implications.
 
 - [Effective Go](http://golang.org/doc/effective_go.html) - The entire dcrd
   suite follows the guidelines in this document.  For your code to be accepted,
-  it must follow the guidelinestherein.
+  it must follow the guidelines therein.
 - [Original Satoshi Whitepaper](http://www.google.com/url?sa=t&rct=j&q=&esrc=s&source=web&cd=1&cad=rja&ved=0CCkQFjAA&url=http%3A%2F%2Fbitcoin.org%2Fbitcoin.pdf&ei=os3VUuH8G4SlsASV74GoAg&usg=AFQjCNEipPLigou_1MfB7DQjXCNdlylrBg&sig2=FaHDuT5z36GMWDEnybDJLg&bvm=bv.59378465,d.b2I) - This is the white paper that started it all.  Having a solid
   foundation to build on will make the code much more comprehensible.
 
diff --git a/txscript/data/script_valid.json b/txscript/data/script_valid.json
index 7f4a2a6e..6f1e8cf8 100644
--- a/txscript/data/script_valid.json
+++ b/txscript/data/script_valid.json
@@ -257,8 +257,8 @@
 ["'abcdefghijklmnopqrstuvwxyz'", "HASH256 0x4c 0x20 0x513d6e9cb7f369fa60933bc48818da2cd0c0a079ebdd29a0cce382d4625dcb39 EQUAL", "P2SH,STRICTENC"],
 
 
-["1","NOP1 NOP2 NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10 1 EQUAL", "P2SH,STRICTENC"],
-["'NOP_1_to_10' NOP1 NOP2 NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10","'NOP_1_to_10' EQUAL", "P2SH,STRICTENC"],
+["1","NOP1 CHECKLOCKTIMEVERIFY NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10 1 EQUAL", "P2SH,STRICTENC"],
+["'NOP_1_to_10' NOP1 CHECKLOCKTIMEVERIFY NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10","'NOP_1_to_10' EQUAL", "P2SH,STRICTENC"],
 
 ["1", "NOP", "P2SH,STRICTENC,DISCOURAGE_UPGRADABLE_NOPS", "Discourage NOPx flag allows OP_NOP"],
 
@@ -467,7 +467,7 @@
 ["NOP", "1", "P2SH,STRICTENC"],
 
 ["NOP", "NOP1 1", "P2SH,STRICTENC"],
-["NOP", "NOP2 1", "P2SH,STRICTENC"],
+["NOP", "CHECKLOCKTIMEVERIFY 1", "P2SH,STRICTENC"],
 ["NOP", "NOP3 1", "P2SH,STRICTENC"],
 ["NOP", "NOP4 1", "P2SH,STRICTENC"],
 ["NOP", "NOP5 1", "P2SH,STRICTENC"],
diff --git a/txscript/sigcache.go b/txscript/sigcache.go
index 227ca367..3903fe26 100644
--- a/txscript/sigcache.go
+++ b/txscript/sigcache.go
@@ -40,7 +40,7 @@ type SigCache struct {
 
 // NewSigCache creates and initializes a new instance of SigCache. Its sole
 // parameter 'maxEntries' represents the maximum number of entries allowed to
-// exist in the SigCache and any particular moment. Random entries are evicted
+// exist in the SigCache at any particular moment. Random entries are evicted
 // to make room for new entries that would cause the number of entries in the
 // cache to exceed the max.
 func NewSigCache(maxEntries uint) *SigCache {
@@ -64,7 +64,7 @@ func (s *SigCache) Exists(sigHash chainhash.Hash, sig chainec.Signature, pubKey
 
 // Add adds an entry for a signature over 'sigHash' under public key 'pubKey'
 // to the signature cache. In the event that the SigCache is 'full', an
-// existing entry it randomly chosen to be evicted in order to make space for
+// existing entry is randomly chosen to be evicted in order to make space for
 // the new entry.
 //
 // NOTE: This function is safe for concurrent access. Writers will block
diff --git a/txscript/sigcache_test.go b/txscript/sigcache_test.go
index 9d5c3521..b4b8a985 100644
--- a/txscript/sigcache_test.go
+++ b/txscript/sigcache_test.go
@@ -14,8 +14,8 @@ import (
 	"github.com/decred/dcrd/chaincfg/chainhash"
 )
 
-// genRandomSig returns a random message, public key, and a signature of the
-// message under the public key. This function is used to generate randomized
+// genRandomSig returns a random message, a signature of the message under the
+// public key and the public key. This function is used to generate randomized
 // test data.
 func genRandomSig() (*chainhash.Hash, chainec.Signature, chainec.PublicKey, error) {
 	secp256k1 := chainec.Secp256k1
@@ -94,7 +94,7 @@ func TestSigCacheAddEvictEntry(t *testing.T) {
 	}
 
 	// Add a new entry, this should cause eviction of a randomly chosen
-	// previously entry.
+	// previous entry.
 	msgNew, sigNew, keyNew, err := genRandomSig()
 	if err != nil {
 		t.Fatalf("unable to generate random signature test data")