diff --git a/lib/blockchain/chain.js b/lib/blockchain/chain.js
index 9b70db7d..3c159fdd 100644
--- a/lib/blockchain/chain.js
+++ b/lib/blockchain/chain.js
@@ -8,7 +8,7 @@
 'use strict';
 
 var assert = require('assert');
-var AsyncObject = require('../utils/async');
+var AsyncObject = require('../utils/asyncobject');
 var Network = require('../protocol/network');
 var Logger = require('../node/logger');
 var ChainDB = require('./chaindb');
diff --git a/lib/blockchain/chaindb.js b/lib/blockchain/chaindb.js
index f4128d7b..af8f717e 100644
--- a/lib/blockchain/chaindb.js
+++ b/lib/blockchain/chaindb.js
@@ -8,7 +8,7 @@
 'use strict';
 
 var assert = require('assert');
-var AsyncObject = require('../utils/async');
+var AsyncObject = require('../utils/asyncobject');
 var util = require('../utils/util');
 var BufferReader = require('../utils/reader');
 var StaticWriter = require('../utils/staticwriter');
diff --git a/lib/db/lowlevelup.js b/lib/db/lowlevelup.js
index bac97210..dccf00cc 100644
--- a/lib/db/lowlevelup.js
+++ b/lib/db/lowlevelup.js
@@ -9,7 +9,7 @@
 
 var util = require('../utils/util');
 var assert = require('assert');
-var AsyncObject = require('../utils/async');
+var AsyncObject = require('../utils/asyncobject');
 var co = require('../utils/co');
 var VERSION_ERROR;
 
diff --git a/lib/http/base.js b/lib/http/base.js
index 5c2a218b..30f91713 100644
--- a/lib/http/base.js
+++ b/lib/http/base.js
@@ -8,7 +8,7 @@
 'use strict';
 
 var assert = require('assert');
-var AsyncObject = require('../utils/async');
+var AsyncObject = require('../utils/asyncobject');
 var util = require('../utils/util');
 var URL = require('url');
 var co = require('../utils/co');
diff --git a/lib/http/client.js b/lib/http/client.js
index a2cba468..018866aa 100644
--- a/lib/http/client.js
+++ b/lib/http/client.js
@@ -8,7 +8,7 @@
 'use strict';
 
 var Network = require('../protocol/network');
-var AsyncObject = require('../utils/async');
+var AsyncObject = require('../utils/asyncobject');
 var RPCClient = require('./rpcclient');
 var Amount = require('../btc/amount');
 var util = require('../utils/util');
diff --git a/lib/mempool/mempool.js b/lib/mempool/mempool.js
index 1a0da7be..e1ff64fe 100644
--- a/lib/mempool/mempool.js
+++ b/lib/mempool/mempool.js
@@ -7,7 +7,7 @@
 'use strict';
 
 var assert = require('assert');
-var AsyncObject = require('../utils/async');
+var AsyncObject = require('../utils/asyncobject');
 var common = require('../blockchain/common');
 var policy = require('../protocol/policy');
 var util = require('../utils/util');
diff --git a/lib/mining/miner.js b/lib/mining/miner.js
index 3223a0f3..58cb0c77 100644
--- a/lib/mining/miner.js
+++ b/lib/mining/miner.js
@@ -10,7 +10,7 @@
 var assert = require('assert');
 var util = require('../utils/util');
 var co = require('../utils/co');
-var AsyncObject = require('../utils/async');
+var AsyncObject = require('../utils/asyncobject');
 var Address = require('../primitives/address');
 var MinerBlock = require('./minerblock');
 var Network = require('../protocol/network');
diff --git a/lib/net/bip150.js b/lib/net/bip150.js
index b272518c..abb2376c 100644
--- a/lib/net/bip150.js
+++ b/lib/net/bip150.js
@@ -8,8 +8,8 @@
 
 'use strict';
 
-var EventEmitter = require('events').EventEmitter;
 var assert = require('assert');
+var EventEmitter = require('events').EventEmitter;
 var util = require('../utils/util');
 var co = require('../utils/co');
 var crypto = require('../crypto/crypto');
diff --git a/lib/net/bip152.js b/lib/net/bip152.js
index e4fdb17e..781fd392 100644
--- a/lib/net/bip152.js
+++ b/lib/net/bip152.js
@@ -10,6 +10,7 @@
  * @module net/bip152
  */
 
+var assert = require('assert');
 var util = require('../utils/util');
 var BufferReader = require('../utils/reader');
 var BufferWriter = require('../utils/writer');
@@ -17,7 +18,6 @@ var StaticWriter = require('../utils/staticwriter');
 var encoding = require('../utils/encoding');
 var consensus = require('../protocol/consensus');
 var crypto = require('../crypto/crypto');
-var assert = require('assert');
 var siphash = require('../crypto/siphash');
 var AbstractBlock = require('../primitives/abstractblock');
 var TX = require('../primitives/tx');
diff --git a/lib/net/pool.js b/lib/net/pool.js
index d688e192..012a1a6b 100644
--- a/lib/net/pool.js
+++ b/lib/net/pool.js
@@ -9,7 +9,7 @@
 
 var assert = require('assert');
 var EventEmitter = require('events').EventEmitter;
-var AsyncObject = require('../utils/async');
+var AsyncObject = require('../utils/asyncobject');
 var util = require('../utils/util');
 var IP = require('../utils/ip');
 var co = require('../utils/co');
diff --git a/lib/net/socks.js b/lib/net/socks.js
index 736a7216..155042e8 100644
--- a/lib/net/socks.js
+++ b/lib/net/socks.js
@@ -6,6 +6,10 @@
 
 'use strict';
 
+/**
+ * @module net/socks
+ */
+
 var assert = require('assert');
 var EventEmitter = require('events').EventEmitter;
 var net = require('net');
@@ -15,10 +19,6 @@ var IP = require('../utils/ip');
 var StaticWriter = require('../utils/staticwriter');
 var BufferReader = require('../utils/reader');
 
-/**
- * @module net/socks
- */
-
 /**
  * SOCKS state machine
  * @constructor
diff --git a/lib/node/node.js b/lib/node/node.js
index 44ebeeaf..b1ddffe6 100644
--- a/lib/node/node.js
+++ b/lib/node/node.js
@@ -8,7 +8,7 @@
 'use strict';
 
 var assert = require('assert');
-var AsyncObject = require('../utils/async');
+var AsyncObject = require('../utils/asyncobject');
 var util = require('../utils/util');
 var co = require('../utils/co');
 var Network = require('../protocol/network');
diff --git a/lib/node/nodeclient.js b/lib/node/nodeclient.js
index f242171d..de438ba9 100644
--- a/lib/node/nodeclient.js
+++ b/lib/node/nodeclient.js
@@ -8,7 +8,7 @@
 
 var util = require('../utils/util');
 var co = require('../utils/co');
-var AsyncObject = require('../utils/async');
+var AsyncObject = require('../utils/asyncobject');
 
 /**
  * NodeClient
diff --git a/lib/script/script.js b/lib/script/script.js
index 185713ca..bcbd3fd2 100644
--- a/lib/script/script.js
+++ b/lib/script/script.js
@@ -39,7 +39,6 @@ var STACK_NEGATE = common.STACK_NEGATE;
  * of script code or a serialized script Buffer.
  * @property {Array} code - Parsed script code.
  * @property {Buffer?} raw - Serialized script.
- * @property {Script?} redeem - Redeem script.
  * @property {Number} length - Number of parsed opcodes.
  */
 
@@ -494,6 +493,7 @@ Script.prototype.removeSeparators = function removeSeparators() {
  * @param {Number?} flags - Script standard flags.
  * @param {TX?} tx - Transaction being verified.
  * @param {Number?} index - Index of input being verified.
+ * @param {Amount?} value - Previous output value.
  * @param {Number?} version - Signature hash version (0=legacy, 1=segwit).
  * @throws {ScriptError} Will be thrown on VERIFY failures, among other things.
  * @returns {Boolean} Whether the execution was successful.
diff --git a/lib/utils/async.js b/lib/utils/asyncobject.js
similarity index 100%
rename from lib/utils/async.js
rename to lib/utils/asyncobject.js
diff --git a/lib/utils/index.js b/lib/utils/index.js
index 12b9c0a8..940c5552 100644
--- a/lib/utils/index.js
+++ b/lib/utils/index.js
@@ -5,7 +5,7 @@
  */
 
 exports.ASN1 = require('./asn1');
-exports.AsyncObject = require('./async');
+exports.AsyncObject = require('./asyncobject');
 exports.base32 = require('./base32');
 exports.base58 = require('./base58');
 exports.Bloom = require('./bloom');
diff --git a/lib/wallet/client.js b/lib/wallet/client.js
index 76af2be1..67ae38f2 100644
--- a/lib/wallet/client.js
+++ b/lib/wallet/client.js
@@ -8,7 +8,7 @@
 'use strict';
 
 var Network = require('../protocol/network');
-var AsyncObject = require('../utils/async');
+var AsyncObject = require('../utils/asyncobject');
 var TX = require('../primitives/tx');
 var BlockMeta = require('./records').BlockMeta;
 var Headers = require('../primitives/headers');
diff --git a/lib/wallet/walletdb.js b/lib/wallet/walletdb.js
index bfc6da04..3069cbc2 100644
--- a/lib/wallet/walletdb.js
+++ b/lib/wallet/walletdb.js
@@ -8,7 +8,7 @@
 'use strict';
 
 var assert = require('assert');
-var AsyncObject = require('../utils/async');
+var AsyncObject = require('../utils/asyncobject');
 var util = require('../utils/util');
 var co = require('../utils/co');
 var Lock = require('../utils/lock');