diff --git a/browser/bundle.js b/browser/bundle.js
index 80d03bf..053ee98 100644
--- a/browser/bundle.js
+++ b/browser/bundle.js
@@ -59,7 +59,7 @@ module.exports=require('x1O6JW');
 },{"../util":189,"./Key":"ALJ4PS","buffer":93}],"./lib/Message":[function(require,module,exports){
 module.exports=require('CBDCgz');
 },{}],"qYkfjX":[function(require,module,exports){
-var log=require("../util/log"),networks=require("../networks"),Address=require("./Address"),Peer=require("./Peer"),PeerManager=require("./PeerManager"),util=require("util"),EventEmitter=require("events").EventEmitter,preconditions=require("preconditions").singleton(),NetworkMonitor=function(e){preconditions.checkArgument(e),this.peerman=e,this.networkName=e.config.network,this.init()};util.inherits(NetworkMonitor,EventEmitter),NetworkMonitor.create=function(e){var t=new PeerManager({network:e.networkName});return t.addPeer(new Peer(e.host,e.port)),new NetworkMonitor(t)},NetworkMonitor.prototype.init=function(){var e=this,t=function(e){var t=e.message.invs;e.conn.sendGetData(t)},n=function(t){e.emit("block",t.message)},o=function(t){var n=t.message.tx;e.emit("tx",n);for(var o=n.getSendingAddresses(e.networkName),r=0;r<o.length;r++){var i=o[r];e.emit("out:"+i,n)}for(var s=n.getReceivingAddresses(e.networkName),r=0;r<s.length;r++){var i=s[r];e.emit("in:"+i,n)}};this.peerman.on("connection",function(r){if(e.connection)throw new Error("Cant handle more than one connection");e.connection=r,r.on("inv",t),r.on("block",n),r.on("tx",o)})},NetworkMonitor.prototype.incoming=function(e,t){preconditions.checkArgument(Address.validate(e)),this.on("in:"+e,t)},NetworkMonitor.prototype.outgoing=function(e,t){preconditions.checkArgument(Address.validate(e)),this.on("out:"+e,t)},NetworkMonitor.prototype.start=function(){this.peerman.start()},NetworkMonitor.prototype.stop=function(){this.peerman.stop()},module.exports=NetworkMonitor;
+var log=require("../util/log"),networks=require("../networks"),Address=require("./Address"),Peer=require("./Peer"),PeerManager=require("./PeerManager"),util=require("util"),EventEmitter=require("events").EventEmitter,preconditions=require("preconditions").singleton(),NetworkMonitor=function(e){preconditions.checkArgument(e),this.peerman=e,this.networkName=e.config.network,this.init()};util.inherits(NetworkMonitor,EventEmitter),NetworkMonitor.create=function(e){this.config=e;var t=new PeerManager({network:e.networkName});return t.addPeer(new Peer(e.host,e.port)),new NetworkMonitor(t)},NetworkMonitor.prototype.init=function(){var e=this,t=function(e){var t=e.message.invs;e.conn.sendGetData(t)},n=function(t){e.emit("block",t.message)},o=function(t){var n=t.message.tx;e.emit("tx",n);for(var o=n.getSendingAddresses(e.config.networkName),r=0;r<o.length;r++){var i=o[r];e.emit("out:"+i,n)}for(var s=n.getReceivingAddresses(e.config.networkName),r=0;r<s.length;r++){var i=s[r];e.emit("in:"+i,n)}};this.peerman.on("connection",function(r){if(e.connection)throw new Error("Cant handle more than one connection");e.connection=r,r.on("inv",t),r.on("block",n),r.on("tx",o)})},NetworkMonitor.prototype.incoming=function(e,t){preconditions.checkArgument(Address.validate(e)),this.on("in:"+e,t)},NetworkMonitor.prototype.outgoing=function(e,t){preconditions.checkArgument(Address.validate(e)),this.on("out:"+e,t)},NetworkMonitor.prototype.start=function(){this.peerman.start()},NetworkMonitor.prototype.stop=function(){this.peerman.stop()},module.exports=NetworkMonitor;
 },{"../networks":"ULNIu2","../util/log":"AdF7pF","./Address":"G+CcXD","./Peer":"oolY81","./PeerManager":"nsqKeP","events":"T9Wsc/","preconditions":161,"util":126}],"./lib/NetworkMonitor":[function(require,module,exports){
 module.exports=require('qYkfjX');
 },{}],"Zm7/h9":[function(require,module,exports){
@@ -91,7 +91,7 @@ module.exports=require('EyghZQ');
 },{}],"EyghZQ":[function(require,module,exports){
 function SINKey(e){"object"!=typeof e&&(e={}),this.created=e.created,this.privKey=e.privKey}var coinUtil=require("../util"),timeUtil=require("../util/time"),Key=require("./Key"),SIN=require("./SIN");SINKey.prototype.generate=function(){this.privKey=Key.generateSync(),this.created=timeUtil.curtime()},SINKey.prototype.pubkeyHash=function(){return coinUtil.sha256ripe160(this.privKey.public)},SINKey.prototype.storeObj=function(){var e=this.privKey.public.toString("hex"),t=this.pubkeyHash(),i=new SIN(SIN.SIN_EPHEM,t),r={created:this.created,priv:this.privKey.private.toString("hex"),pub:e,sin:i.toString()};return r},module.exports=SINKey;
 },{"../util":189,"../util/time":192,"./Key":"ALJ4PS","./SIN":"tBM27q"}],"hQ0t76":[function(require,module,exports){
-(function(t){function e(t){this.buffer=t?t:f.EMPTY_BUFFER,this.chunks=[],this.parse()}function r(t){return t==h.map.OP_0||t>=h.map.OP_1&&t<=h.map.OP_16}function n(t){return t<h.map.OP_PUSHDATA1?1:255>=t?2:65535>=t?3:5}function s(e){var r=void 0;return e<h.map.OP_PUSHDATA1?(r=new t(1),r.writeUInt8(e,0)):255>=e?(r=new t(2),r.writeUInt8(h.map.OP_PUSHDATA1,0),r.writeUInt8(e,1)):65535>=e?(r=new t(3),r.writeUInt8(h.map.OP_PUSHDATA2,0),r.writeUInt16LE(e,1)):(r=new t(5),r.writeUInt8(h.map.OP_PUSHDATA4,0),r.writeUInt32LE(e,1)),r}var u=(require("../config"),require("../util/log")),h=require("./Opcode"),o=require("buffertools"),f=require("../util/util"),c=require("../util/BinaryParser"),p=require("bufferput"),a=0,l=1,g=2,k=3,w=4,y=["unknown","pubkey","pubkeyhash","multisig","scripthash"];e.TX_UNKNOWN=a,e.TX_PUBKEY=l,e.TX_PUBKEYHASH=g,e.TX_MULTISIG=k,e.TX_SCRIPTHASH=w,e.prototype.parse=function(){this.chunks=[];for(var t=new c(this.buffer);!t.eof();){var e,r,n=t.word8();n>0&&n<h.map.OP_PUSHDATA1?this.chunks.push(t.buffer(n)):n===h.map.OP_PUSHDATA1?(e=t.word8(),r=t.buffer(e),this.chunks.push(r)):n===h.map.OP_PUSHDATA2?(e=t.word16le(),r=t.buffer(e),this.chunks.push(r)):n===h.map.OP_PUSHDATA4?(e=t.word32le(),r=t.buffer(e),this.chunks.push(r)):this.chunks.push(n)}},e.prototype.isPushOnly=function(){for(var e=0;e<this.chunks.length;e++){var r=this.chunks[e];if(!t.isBuffer(r)&&r>h.map.OP_16)return!1}return!0},e.prototype.isP2SH=function(){return 3==this.chunks.length&&this.chunks[0]==h.map.OP_HASH160&&t.isBuffer(this.chunks[1])&&20==this.chunks[1].length&&this.chunks[2]==h.map.OP_EQUAL},e.prototype.isPubkey=function(){return 2==this.chunks.length&&t.isBuffer(this.chunks[0])&&this.chunks[1]==h.map.OP_CHECKSIG},e.prototype.isPubkeyHash=function(){return 5==this.chunks.length&&this.chunks[0]==h.map.OP_DUP&&this.chunks[1]==h.map.OP_HASH160&&t.isBuffer(this.chunks[2])&&20==this.chunks[2].length&&this.chunks[3]==h.map.OP_EQUALVERIFY&&this.chunks[4]==h.map.OP_CHECKSIG},e.prototype.isMultiSig=function(){return this.chunks.length>3&&r(this.chunks[0])&&this.chunks.slice(1,this.chunks.length-2).every(function(e){return t.isBuffer(e)})&&r(this.chunks[this.chunks.length-2])&&this.chunks[this.chunks.length-1]==h.map.OP_CHECKMULTISIG},e.prototype.isP2shScriptSig=function(){if(!r(this.chunks[0])||0!==this.chunks[0])return!1;var t=new e(this.chunks[this.chunks.length-1]),n=t.classify();return n!==a},e.prototype.isMultiSigScriptSig=function(){return r(this.chunks[0])&&0===this.chunks[0]?!this.isP2shScriptSig():!1},e.prototype.countSignatures=function(){var t=0,e=this.chunks.length;return t=this.isMultiSigScriptSig()?e-1:this.isP2shScriptSig()?e-2:0===o.compare(this.getBuffer(),f.EMPTY_BUFFER)?0:1},e.prototype.countMissingSignatures=function(){if(this.isMultiSig())return u.debug("Can not count missing signatures on normal Multisig script"),null;var t=0,n=this.chunks.length;if(r(this.chunks[0])&&0===this.chunks[0]){var i=new e(this.chunks[n-1]);if(r(i.chunks[0])){var s=i.chunks[0]-80;t=s-(n-2)}else u.debug("Unrecognized script type")}else 0===o.compare(this.getBuffer(),f.EMPTY_BUFFER)&&(t=1);return t},e.prototype.finishedMultiSig=function(){var t=this.countMissingSignatures();return null===t?null:0===t},e.prototype.getMultiSigInfo=function(){if(!this.isMultiSig())throw new Error("Script.getMultiSigInfo(): Not a multiSig script.");for(var t=this.chunks[0]-80,e=this.chunks[this.chunks.length-2]-80,r=[],n=1;n<this.chunks.length-2;n++)r.push(this.chunks[n]);if(r.length!=e)throw new Error("Script.getMultiSigInfo(): Amount of PKs does not match what the script specifies.");return{nsigs:t,npubkeys:e,pubkeys:r}},e.prototype.prependOp0=function(){var t=[0];for(i in this.chunks)this.chunks.hasOwnProperty(i)&&t.push(this.chunks[i]);return this.chunks=t,this.updateBuffer(),this},e.prototype.classify=function(){return this.isPubkeyHash()?g:this.isP2SH()?w:this.isMultiSig()?k:this.isPubkey()?l:a},e.prototype.capture=function(){var t=this.classify(),e=[];switch(t){case l:e.push(this.chunks[0]);break;case g:e.push(this.chunks[2]);break;case k:for(var r=1;r<this.chunks.length-2;r++)e.push(this.chunks[r]);break;case w:e.push(this.chunks[1]);break;case a:}return e},e.prototype.captureOne=function(){var t=this.capture();return t[0]},e.prototype.getOutType=function(){var t=this.classify();switch(t){case l:return"Pubkey";case g:return"Address";default:return"Strange"}},e.prototype.getRawOutType=function(){return y[this.classify()]},e.prototype.simpleOutHash=function(){switch(this.getOutType()){case"Address":return this.chunks[2];case"Pubkey":return f.sha256ripe160(this.chunks[0]);default:return u.debug("Encountered non-standard scriptPubKey"),u.debug("Strange script was: "+this.toString()),null}},e.prototype.getInType=function(){return 1==this.chunks.length?"Pubkey":2==this.chunks.length&&t.isBuffer(this.chunks[0])&&t.isBuffer(this.chunks[1])?"Address":"Strange"},e.prototype.simpleInPubKey=function(){switch(this.getInType()){case"Address":return this.chunks[1];case"Pubkey":return null;default:return u.debug("Encountered non-standard scriptSig"),u.debug("Strange script was: "+this.toString()),null}},e.prototype.getBuffer=function(){return this.buffer},e.prototype.serialize=e.prototype.getBuffer,e.prototype.getStringContent=function(e,r){null===e&&(e=!0),"undefined"==typeof r&&(r=15);for(var n="",i=0,s=this.chunks.length;s>i;i++){var u=this.chunks[i];if(i>0&&(n+=" "),n+=t.isBuffer(u)?"0x"+f.formatBuffer(u,e?null:0):h.reverseMap[u],r&&i>r){n+=" ...";break}}return n},e.prototype.toString=function(t,e){var r="<Script ";return r+=this.getStringContent(t,e),r+=">"},e.prototype.writeOp=function(e){var r=t(this.buffer.length+1);this.buffer.copy(r),r.writeUInt8(e,this.buffer.length),this.buffer=r,this.chunks.push(e)},e.prototype.writeN=function(t){if(0>t||t>16)throw new Error("writeN: out of range value "+t);this.writeOp(0==t?h.map.OP_0:h.map.OP_1+t-1)},e.prototype.writeBytes=function(e){this.buffer.length+n(e.length)+e.length;this.buffer=t.concat([this.buffer,s(e.length),e]),this.chunks.push(e)},e.prototype.updateBuffer=function(){this.buffer=e.chunksToBuffer(this.chunks)},e.prototype.findAndDelete=function(e){var r=!1;if(t.isBuffer(e))for(var n=0,i=this.chunks.length;i>n;n++)t.isBuffer(this.chunks[n])&&0===o.compare(this.chunks[n],e)&&(this.chunks.splice(n,1),n--,r=!0);else{if("number"!=typeof e)throw new Error("Invalid chunk datatype.");for(var n=0,i=this.chunks.length;i>n;n++)this.chunks[n]===e&&(this.chunks.splice(n,1),n--,r=!0)}r&&this.updateBuffer()},e.createPubKeyOut=function(t){var r=new e;return r.writeBytes(t),r.writeOp(h.map.OP_CHECKSIG),r},e.createPubKeyHashOut=function(t){var r=new e;return r.writeOp(h.map.OP_DUP),r.writeOp(h.map.OP_HASH160),r.writeBytes(t),r.writeOp(h.map.OP_EQUALVERIFY),r.writeOp(h.map.OP_CHECKSIG),r},e._sortKeys=function(t){return t.sort(function(t,e){for(var r=t.length>t.length?t.length:e.length,n=0;r>=n;n++){if(void 0===t[n])return-1;if(void 0===e[n])return 1;if(t[n]<e[n])return-1;if(t[n]>e[n])return 1}return 0})},e.createMultisig=function(t,r,n){n=n||{};var i=n.noSorting?r:this._sortKeys(r),s=new e;return s.writeN(t),i.forEach(function(t){s.writeBytes(t)}),s.writeN(i.length),s.writeOp(h.map.OP_CHECKMULTISIG),s},e.createP2SH=function(t){var r=new e;return r.writeOp(h.map.OP_HASH160),r.writeBytes(t),r.writeOp(h.map.OP_EQUAL),r},e.fromTestData=function(r){r=r.map(function(e){return"string"==typeof e?new t(e,"hex"):e});var n=new e;return n.chunks=r,n.updateBuffer(),n},e.fromChunks=function(t){var r=new e;return r.chunks=t,r.updateBuffer(),r},e.fromHumanReadable=function(t){return new e(e.stringToBuffer(t))},e.prototype.toHumanReadable=function(){for(var e="",r=0,n=this.chunks.length;n>r;r++){var i=this.chunks[r];if(r>0&&(e+=" "),t.isBuffer(i))0===i.length?e+="0":(e+="0x"+f.formatBuffer(s(i.length),0)+" ",e+="0x"+f.formatBuffer(i,0));else{var u=h.reverseMap[i];"undefined"==typeof u&&(u="0x"+i.toString(16)),e+=u}}return e},e.stringToBuffer=function(r){for(var n=new p,i=r.split(" "),s=0;s<i.length;s++){var u=i[s];if(""!==u)if(u.length>2&&"0x"===u.substring(0,2))n.put(new t(u.substring(2,u.length),"hex"));else{var o=h.map["OP_"+u]||h.map[u];if("undefined"!=typeof o)n.word8(o);else{var c=parseInt(u);if(isNaN(c)){if("'"!==u[0]||"'"!==u[u.length-1])throw new Error('Could not parse word "'+u+'" from script "'+r+'"');u=u.substring(1,u.length-1),n.put(e.chunksToBuffer([new t(u)]))}else{var a=f.intToBufferSM(c);n.put(e.chunksToBuffer([a]))}}}}return n.buffer()},e.chunksToBuffer=function(e){for(var r=new p,n=0,i=e.length;i>n;n++){var s=e[n];if(t.isBuffer(s))s.length<h.map.OP_PUSHDATA1?r.word8(s.length):s.length<=255?(r.word8(h.map.OP_PUSHDATA1),r.word8(s.length)):s.length<=65535?(r.word8(h.map.OP_PUSHDATA2),r.word16le(s.length)):(r.word8(h.map.OP_PUSHDATA4),r.word32le(s.length)),r.put(s);else{if("number"!=typeof s)throw new Error("Script.chunksToBuffer(): Invalid chunk datatype");r.word8(s)}}return r.buffer()},module.exports=e}).call(this,require("buffer").Buffer);
+(function(t){function e(t){this.buffer=t?t:f.EMPTY_BUFFER,this.chunks=[],this.parse()}function r(t){return t==h.map.OP_0||t>=h.map.OP_1&&t<=h.map.OP_16}function n(t){return t<h.map.OP_PUSHDATA1?1:255>=t?2:65535>=t?3:5}function s(e){var r=void 0;return e<h.map.OP_PUSHDATA1?(r=new t(1),r.writeUInt8(e,0)):255>=e?(r=new t(2),r.writeUInt8(h.map.OP_PUSHDATA1,0),r.writeUInt8(e,1)):65535>=e?(r=new t(3),r.writeUInt8(h.map.OP_PUSHDATA2,0),r.writeUInt16LE(e,1)):(r=new t(5),r.writeUInt8(h.map.OP_PUSHDATA4,0),r.writeUInt32LE(e,1)),r}var u=(require("../config"),require("../util/log")),h=require("./Opcode"),o=require("buffertools"),f=require("../util/util"),c=require("../util/BinaryParser"),p=require("bufferput"),a=0,l=1,g=2,k=3,y=4,w=["unknown","pubkey","pubkeyhash","multisig","scripthash"];e.TX_UNKNOWN=a,e.TX_PUBKEY=l,e.TX_PUBKEYHASH=g,e.TX_MULTISIG=k,e.TX_SCRIPTHASH=y,e.prototype.parse=function(){this.chunks=[];for(var t=new c(this.buffer);!t.eof();){var e,r,n=t.word8();n>0&&n<h.map.OP_PUSHDATA1?this.chunks.push(t.buffer(n)):n===h.map.OP_PUSHDATA1?(e=t.word8(),r=t.buffer(e),this.chunks.push(r)):n===h.map.OP_PUSHDATA2?(e=t.word16le(),r=t.buffer(e),this.chunks.push(r)):n===h.map.OP_PUSHDATA4?(e=t.word32le(),r=t.buffer(e),this.chunks.push(r)):this.chunks.push(n)}},e.prototype.isPushOnly=function(){for(var e=0;e<this.chunks.length;e++){var r=this.chunks[e];if(!t.isBuffer(r)&&r>h.map.OP_16)return!1}return!0},e.prototype.isP2SH=function(){return 3==this.chunks.length&&this.chunks[0]==h.map.OP_HASH160&&t.isBuffer(this.chunks[1])&&20==this.chunks[1].length&&this.chunks[2]==h.map.OP_EQUAL},e.prototype.isPubkey=function(){return 2==this.chunks.length&&t.isBuffer(this.chunks[0])&&this.chunks[1]==h.map.OP_CHECKSIG},e.prototype.isPubkeyHash=function(){return 5==this.chunks.length&&this.chunks[0]==h.map.OP_DUP&&this.chunks[1]==h.map.OP_HASH160&&t.isBuffer(this.chunks[2])&&20==this.chunks[2].length&&this.chunks[3]==h.map.OP_EQUALVERIFY&&this.chunks[4]==h.map.OP_CHECKSIG},e.prototype.isMultiSig=function(){return this.chunks.length>3&&r(this.chunks[0])&&this.chunks.slice(1,this.chunks.length-2).every(function(e){return t.isBuffer(e)})&&r(this.chunks[this.chunks.length-2])&&this.chunks[this.chunks.length-1]==h.map.OP_CHECKMULTISIG},e.prototype.isPubkeyHashScript=function(){return 2==this.chunks.length&&t.isBuffer(this.chunks[0])&&t.isBuffer(this.chunks[1])},e.prototype.isP2shScriptSig=function(){if(!r(this.chunks[0])||0!==this.chunks[0])return!1;var t=new e(this.chunks[this.chunks.length-1]),n=t.classify();return n!==a},e.prototype.isMultiSigScriptSig=function(){return r(this.chunks[0])&&0===this.chunks[0]?!this.isP2shScriptSig():!1},e.prototype.countSignatures=function(){var t=0,e=this.chunks.length;return t=this.isMultiSigScriptSig()?e-1:this.isP2shScriptSig()?e-2:this.isPubkeyHashScript()?1:0},e.prototype.getSignatures=function(){ret=[];var t=this.chunks.length;if(this.isMultiSigScriptSig())for(var e=1;t>e;e++)ret.push(this.chunks[e]);else if(this.isP2shScriptSig())for(var e=1;t-1>e;e++)ret.push(this.chunks[e]);else this.isPubkeyHashScript()&&ret.push(this.chunks[0]);return ret},e.prototype.getHashType=function(){for(var t=this.getSignatures(),e=null,r=0;r<t.length;r++){var n=t[r],s=n[n.length-1];if(null!==e&&e!==s)return null;e=s}return e},e.prototype.countMissingSignatures=function(){if(this.isMultiSig())return u.debug("Can not count missing signatures on normal Multisig script"),null;var t=0,n=this.chunks.length;if(r(this.chunks[0])&&0===this.chunks[0]){var s=new e(this.chunks[n-1]);if(r(s.chunks[0])){var i=s.chunks[0]-80;t=i-(n-2)}else u.debug("Unrecognized script type")}else 0===o.compare(this.getBuffer(),f.EMPTY_BUFFER)&&(t=1);return t},e.prototype.finishedMultiSig=function(){var t=this.countMissingSignatures();return null===t?null:0===t},e.prototype.getMultiSigInfo=function(){if(!this.isMultiSig())throw new Error("Script.getMultiSigInfo(): Not a multiSig script.");for(var t=this.chunks[0]-80,e=this.chunks[this.chunks.length-2]-80,r=[],n=1;n<this.chunks.length-2;n++)r.push(this.chunks[n]);if(r.length!=e)throw new Error("Script.getMultiSigInfo(): Amount of PKs does not match what the script specifies.");return{nsigs:t,npubkeys:e,pubkeys:r}},e.prototype.prependOp0=function(){var t=[0];for(i in this.chunks)this.chunks.hasOwnProperty(i)&&t.push(this.chunks[i]);return this.chunks=t,this.updateBuffer(),this},e.prototype.classify=function(){return this.isPubkeyHash()?g:this.isP2SH()?y:this.isMultiSig()?k:this.isPubkey()?l:a},e.prototype.capture=function(){var t=this.classify(),e=[];switch(t){case l:e.push(this.chunks[0]);break;case g:e.push(this.chunks[2]);break;case k:for(var r=1;r<this.chunks.length-2;r++)e.push(this.chunks[r]);break;case y:e.push(this.chunks[1]);break;case a:}return e},e.prototype.captureOne=function(){var t=this.capture();return t[0]},e.prototype.getOutType=function(){var t=this.classify();switch(t){case l:return"Pubkey";case g:return"Address";default:return"Strange"}},e.prototype.getRawOutType=function(){return w[this.classify()]},e.prototype.simpleOutHash=function(){switch(this.getOutType()){case"Address":return this.chunks[2];case"Pubkey":return f.sha256ripe160(this.chunks[0]);default:return u.debug("Encountered non-standard scriptPubKey"),u.debug("Strange script was: "+this.toString()),null}},e.prototype.getInType=function(){return 1==this.chunks.length?"Pubkey":2==this.chunks.length&&t.isBuffer(this.chunks[0])&&t.isBuffer(this.chunks[1])?"Address":"Strange"},e.prototype.simpleInPubKey=function(){switch(this.getInType()){case"Address":return this.chunks[1];case"Pubkey":return null;default:return u.debug("Encountered non-standard scriptSig"),u.debug("Strange script was: "+this.toString()),null}},e.prototype.getBuffer=function(){return this.buffer},e.prototype.serialize=e.prototype.getBuffer,e.prototype.getStringContent=function(e,r){null===e&&(e=!0),"undefined"==typeof r&&(r=15);for(var n="",s=0,i=this.chunks.length;i>s;s++){var u=this.chunks[s];if(s>0&&(n+=" "),n+=t.isBuffer(u)?"0x"+f.formatBuffer(u,e?null:0):h.reverseMap[u],r&&s>r){n+=" ...";break}}return n},e.prototype.toString=function(t,e){var r="<Script ";return r+=this.getStringContent(t,e),r+=">"},e.prototype.writeOp=function(e){var r=t(this.buffer.length+1);this.buffer.copy(r),r.writeUInt8(e,this.buffer.length),this.buffer=r,this.chunks.push(e)},e.prototype.writeN=function(t){if(0>t||t>16)throw new Error("writeN: out of range value "+t);this.writeOp(0==t?h.map.OP_0:h.map.OP_1+t-1)},e.prototype.writeBytes=function(e){this.buffer.length+n(e.length)+e.length;this.buffer=t.concat([this.buffer,s(e.length),e]),this.chunks.push(e)},e.prototype.updateBuffer=function(){this.buffer=e.chunksToBuffer(this.chunks)},e.prototype.findAndDelete=function(e){var r=!1;if(t.isBuffer(e))for(var n=0,s=this.chunks.length;s>n;n++)t.isBuffer(this.chunks[n])&&0===o.compare(this.chunks[n],e)&&(this.chunks.splice(n,1),n--,r=!0);else{if("number"!=typeof e)throw new Error("Invalid chunk datatype.");for(var n=0,s=this.chunks.length;s>n;n++)this.chunks[n]===e&&(this.chunks.splice(n,1),n--,r=!0)}r&&this.updateBuffer()},e.createPubKeyOut=function(t){var r=new e;return r.writeBytes(t),r.writeOp(h.map.OP_CHECKSIG),r},e.createPubKeyHashOut=function(t){var r=new e;return r.writeOp(h.map.OP_DUP),r.writeOp(h.map.OP_HASH160),r.writeBytes(t),r.writeOp(h.map.OP_EQUALVERIFY),r.writeOp(h.map.OP_CHECKSIG),r},e._sortKeys=function(t){return t.sort(function(t,e){for(var r=t.length>t.length?t.length:e.length,n=0;r>=n;n++){if(void 0===t[n])return-1;if(void 0===e[n])return 1;if(t[n]<e[n])return-1;if(t[n]>e[n])return 1}return 0})},e.createMultisig=function(t,r,n){n=n||{};var s=n.noSorting?r:this._sortKeys(r),i=new e;return i.writeN(t),s.forEach(function(t){i.writeBytes(t)}),i.writeN(s.length),i.writeOp(h.map.OP_CHECKMULTISIG),i},e.createP2SH=function(t){var r=new e;return r.writeOp(h.map.OP_HASH160),r.writeBytes(t),r.writeOp(h.map.OP_EQUAL),r},e.fromTestData=function(r){r=r.map(function(e){return"string"==typeof e?new t(e,"hex"):e});var n=new e;return n.chunks=r,n.updateBuffer(),n},e.fromChunks=function(t){var r=new e;return r.chunks=t,r.updateBuffer(),r},e.fromHumanReadable=function(t){return new e(e.stringToBuffer(t))},e.prototype.toHumanReadable=function(){for(var e="",r=0,n=this.chunks.length;n>r;r++){var i=this.chunks[r];if(r>0&&(e+=" "),t.isBuffer(i))0===i.length?e+="0":(e+="0x"+f.formatBuffer(s(i.length),0)+" ",e+="0x"+f.formatBuffer(i,0));else{var u=h.reverseMap[i];"undefined"==typeof u&&(u="0x"+i.toString(16)),e+=u}}return e},e.stringToBuffer=function(r){for(var n=new p,s=r.split(" "),i=0;i<s.length;i++){var u=s[i];if(""!==u)if(u.length>2&&"0x"===u.substring(0,2))n.put(new t(u.substring(2,u.length),"hex"));else{var o=h.map["OP_"+u]||h.map[u];if("undefined"!=typeof o)n.word8(o);else{var c=parseInt(u);if(isNaN(c)){if("'"!==u[0]||"'"!==u[u.length-1])throw new Error('Could not parse word "'+u+'" from script "'+r+'"');u=u.substring(1,u.length-1),n.put(e.chunksToBuffer([new t(u)]))}else{var a=f.intToBufferSM(c);n.put(e.chunksToBuffer([a]))}}}}return n.buffer()},e.chunksToBuffer=function(e){for(var r=new p,n=0,s=e.length;s>n;n++){var i=e[n];if(t.isBuffer(i))i.length<h.map.OP_PUSHDATA1?r.word8(i.length):i.length<=255?(r.word8(h.map.OP_PUSHDATA1),r.word8(i.length)):i.length<=65535?(r.word8(h.map.OP_PUSHDATA2),r.word16le(i.length)):(r.word8(h.map.OP_PUSHDATA4),r.word32le(i.length)),r.put(i);else{if("number"!=typeof i)throw new Error("Script.chunksToBuffer(): Invalid chunk datatype");r.word8(i)}}return r.buffer()},module.exports=e}).call(this,require("buffer").Buffer);
 },{"../config":"4itQ50","../util/BinaryParser":"b3ZSD7","../util/log":"AdF7pF","../util/util":"ACyo5H","./Opcode":"Zm7/h9","buffer":93,"bufferput":"aXRuS6","buffertools":"fugeBw"}],"./lib/Script":[function(require,module,exports){
 module.exports=require('hQ0t76');
 },{}],"Q/ZWXW":[function(require,module,exports){
@@ -101,8 +101,8 @@ module.exports=require('Q/ZWXW');
 },{}],"./lib/Transaction":[function(require,module,exports){
 module.exports=require('LJhYtm');
 },{}],"LJhYtm":[function(require,module,exports){
-(function(t){function e(e){if("object"!=typeof e&&(e={}),e.o)this.o=e.o;else if(e.oTxHash&&"undefined"!=typeof e.oIndex&&e.oIndex>=0){var i=new t(e.oTxHash,"hex");i=p.reverse(i);var s=new t(4);s.writeUInt32LE(e.oIndex,0),this.o=t.concat([i,s])}this.s=t.isBuffer(e.s)?e.s:t.isBuffer(e.script)?e.script:h.EMPTY_BUFFER,this.q=e.q?e.q:e.sequence}function i(t){"object"!=typeof t&&(t={}),this.v=t.v?t.v:t.value,this.s=t.s?t.s:t.script}function s(t){"object"!=typeof t&&(t={}),this.hash=t.hash||null,this.version=t.version,this.lock_time=t.lock_time,this.ins=Array.isArray(t.ins)?t.ins.map(function(t){var i=new e;return i.s=t.s,i.q=t.q,i.o=t.o,i}):[],this.outs=Array.isArray(t.outs)?t.outs.map(function(t){var e=new i;return e.v=t.v,e.s=t.s,e}):[],t.buffer&&(this._buffer=t.buffer)}{var n=(require("../config"),require("../util/log"),require("./Address")),r=require("./Script"),o=require("./ScriptInterpreter"),h=require("../util"),u=require("bignum"),a=require("bufferput"),f=require("../util/BinaryParser"),p=(require("step"),require("buffertools")),c=(require("../util/error"),require("./WalletKey"),require("./PrivateKey"),t.concat([h.NULL_HASH,new t("FFFFFFFF","hex")]));parseInt(1e-4*h.COIN)}s.COINBASE_OP=c,e.MAX_SEQUENCE=4294967295,e.prototype.getScript=function(){return new r(this.s)},e.prototype.isCoinBase=function(){return this.o?0===p.compare(new t(this.o),c):!1},e.prototype.serialize=function(){var e=h.varIntBuf(this.s.length),i=new t(4);i.writeUInt32LE(this.q,0);var s=t.concat([this.o,e,this.s,i]);return s},e.prototype.getOutpointHash=function(){return"undefined"!=typeof this.o.outHashCache?this.o.outHashCache:this.o.outHashCache=this.o.slice(0,32)},e.prototype.getOutpointIndex=function(){return this.o[32]+(this.o[33]<<8)+(this.o[34]<<16)+(this.o[35]<<24)},e.prototype.setOutpointIndex=function(t){this.o[32]=255&t,this.o[33]=t>>8&255,this.o[34]=t>>16&255,this.o[35]=t>>24&255},i.prototype.getValue=function(){return new f(this.v).word64lu()},i.prototype.getScript=function(){return new r(this.s)},i.prototype.serialize=function(){var e=h.varIntBuf(this.s.length);return t.concat([this.v,e,this.s])},s.In=e,s.Out=i,s.prototype.isCoinBase=function(){return 1==this.ins.length&&this.ins[0].isCoinBase()},s.prototype.isStandard=function(){var t;for(t=0;t<this.ins.length;t++)if("Strange"==this.ins[t].getScript().getInType())return!1;for(t=0;t<this.outs.length;t++)if("Strange"==this.outs[t].getScript().getOutType())return!1;return!0},s.prototype.serialize=function(){var e=[],i=new t(4);i.writeUInt32LE(this.version,0),e.push(i),e.push(h.varIntBuf(this.ins.length)),this.ins.forEach(function(t){e.push(t.serialize())}),e.push(h.varIntBuf(this.outs.length)),this.outs.forEach(function(t){e.push(t.serialize())});var i=new t(4);return i.writeUInt32LE(this.lock_time,0),e.push(i),this._buffer=t.concat(e),this._buffer},s.prototype.getBuffer=function(){return this._buffer?this._buffer:this.serialize()},s.prototype.calcHash=function(){return this.hash=h.twoSha256(this.getBuffer()),this.hash},s.prototype.checkHash=function(){return this.hash&&this.hash.length?0===p.compare(this.calcHash(),this.hash):!1},s.prototype.getHash=function(){return this.hash&&this.hash.length||(this.hash=this.calcHash()),this.hash},s.prototype.calcNormalizedHash=function(){return this.normalizedHash=this.hashForSignature(new r,0,g),this.normalizedHash},s.prototype.getNormalizedHash=function(){return this.normalizedHash&&this.normalizedHash.length||(this.normalizedHash=this.calcNormalizedHash()),this.normalizedHash},s.prototype.inputs=function(){for(var t=[],e=0;e<this.ins.length;e++){var i=this.ins[e],s=i.getOutpointHash(),n=i.getOutpointIndex();t.push([s,n])}return t},s.prototype.verifyInput=function(t,e,i,s){var n=this.ins[t].getScript();return o.verifyFull(n,e,this,t,0,i,s)},s.prototype.getAffectedKeys=function(t){if(!this.affects||!this.affects.length){this.affects=[];for(var e=0,i=this.outs.length;i>e;e++){var s=this.outs[e],n=s.getScript(),r=n.simpleOutPubKeyHash();r&&this.affects.push(r)}for(var o=t.txIndex,e=0,i=this.ins.length;i>e;e++){var h=this.ins[e];if(!h.isCoinBase()){var u=h.getOutpointHash(),a=h.getOutpointIndex(),f=u.toString("base64"),p=o[f];if(!p)throw new Error("Input not found!");var s=p[a],n=s.getScript(),r=n.simpleOutPubKeyHash();r&&this.affects.push(r)}}}var c={};return this.affects.forEach(function(t){c[t.toString("base64")]=t}),c};var l=171,g=s.SIGHASH_ALL=o.SIGHASH_ALL,v=s.SIGHASH_NONE=o.SIGHASH_NONE,y=s.SIGHASH_SINGLE=o.SIGHASH_SINGLE,S=s.SIGHASH_ANYONECANPAY=o.SIGHASH_ANYONECANPAY,I=function(t,e,i,s){this.txTo=t,this.scriptCode=e,this.nIn=i,this.anyoneCanPay=!!(s&S);var n=31&s;this.hashSingle=n===y,this.hashNone=n===v,this.bytes=new a};I.prototype.serializeOutput=function(t){if(this.hashSingle&&t!=this.nIn)this.bytes.put(h.INT64_MAX),this.bytes.varint(0);else{var e=this.txTo.outs[t];this.bytes.put(e.v),this.bytes.varint(e.s.length),this.bytes.put(e.s)}},I.prototype.serializeScriptCode=function(){this.scriptCode.findAndDelete(l),this.bytes.varint(this.scriptCode.buffer.length),this.bytes.put(this.scriptCode.buffer)},I.prototype.serializeInput=function(t){this.anyoneCanPay&&(t=this.nIn),this.bytes.put(this.txTo.ins[t].o),t!==this.nIn?this.bytes.varint(0):this.serializeScriptCode(),this.bytes.word32le(t!==this.nIn&&(this.hashSingle||this.hashNone)?0:this.txTo.ins[t].q)},I.prototype.serialize=function(){this.bytes.word32le(this.txTo.version);var t=this.anyoneCanPay?1:this.txTo.ins.length;this.bytes.varint(t);for(var e=0;t>e;e++)this.serializeInput(e);var i=this.hashNone?0:this.hashSingle?this.nIn+1:this.txTo.outs.length;this.bytes.varint(i);for(var s=0;i>s;s++)this.serializeOutput(s);this.bytes.word32le(this.txTo.lock_time)},I.prototype.buffer=function(){return this.serialize(),this.bytes.buffer()},s.Serializer=I;var b=function(){var e=new t(32);e.writeUInt8(1,0);for(var i=1;32>i;i++)e.writeUInt8(0,i);return e};s.prototype.hashForSignature=function(e,i,s){if(+i!==i||0>i||i>=this.ins.length)return b();var n=31&s;if(n===y&&i>=this.outs.length)return b();var r=new I(this,e,i,s),o=r.buffer(),u=(new a).word32le(s).buffer();return o=t.concat([o,u]),h.twoSha256(o)},s.prototype.getStandardizedObject=function(){var e={hash:h.formatHashFull(this.getHash()),version:this.version,lock_time:this.lock_time},i=8;i+=h.getVarIntSize(this.ins.length);var s=this.ins.map(function(e){var s={prev_out:{hash:p.reverse(new t(e.getOutpointHash())).toString("hex"),n:e.getOutpointIndex()},sequence:e.q};return e.isCoinBase()?s.coinbase=e.s.toString("hex"):s.scriptSig=new r(e.s).getStringContent(!1,0),i+=36+h.getVarIntSize(e.s.length)+e.s.length+4,s});i+=h.getVarIntSize(this.outs.length);var n=this.outs.map(function(t){return i+=h.getVarIntSize(t.s.length)+t.s.length+8,{value:h.formatValue(t.v),scriptPubKey:new r(t.s).getStringContent(!1,0)}});return e.size=i,e["in"]=s,e.out=n,e},s.prototype.toObject=function(){return this},s.prototype.fromObj=function(s){var o={};o.version=s.version||1,o.lock_time=s.lock_time||0,o.ins=[],o.outs=[],s.inputs.forEach(function(i){var s=new e;s.s=h.EMPTY_BUFFER,s.q=4294967295;var n=new t(i.txid,"hex");n=p.reverse(n);var r=parseInt(i.vout),u=new t(4);u.writeUInt32LE(r,0),s.o=t.concat([n,u]),o.ins.push(s)});var a=Object.keys(s.outputs);a.forEach(function(t){var e=new n(t),a=r.createPubKeyHashOut(e.payload()),f=u(s.outputs[t]),p=h.bigIntToValue(f),c=new i;c.v=p,c.s=a.getBuffer(),o.outs.push(c)}),this.lock_time=o.lock_time,this.version=o.version,this.ins=o.ins,this.outs=o.outs},s.prototype.parse=function(s){t.isBuffer(s)&&(this._buffer=s,s=new f(s));{var n;s.pos}this.version=s.word32le();var r=s.varInt();for(this.ins=[],j=0;r>j;j++){var o=new e;o.o=s.buffer(36),n=s.varInt(),o.s=s.buffer(n),o.q=s.word32le(),this.ins.push(o)}var h=s.varInt();for(this.outs=[],j=0;h>j;j++){var u=new i;u.v=s.buffer(8),n=s.varInt(),u.s=s.buffer(n),this.outs.push(u)}this.lock_time=s.word32le(),this.calcHash()},s.prototype.calcSize=function(){var t=8;return t+=h.getVarIntSize(this.ins.length),this.ins.forEach(function(e){t+=36+h.getVarIntSize(e.s.length)+e.s.length+4}),t+=h.getVarIntSize(this.outs.length),this.outs.forEach(function(e){t+=h.getVarIntSize(e.s.length)+e.s.length+8}),this.size=t,t},s.prototype.getSize=function(){return this.size||(this.size=this.calcSize()),this.size},s.prototype.countInputSignatures=function(t){var e=new r(this.ins[t].s);return e.countSignatures()},s.prototype.countInputMissingSignatures=function(t){var e=new r(this.ins[t].s);return e.countMissingSignatures()},s.prototype.isInputComplete=function(t){var e=this.countInputMissingSignatures(t);return null===e?null:0===e},s.prototype.isComplete=function(){for(var t=!0,e=this.ins.length,i=0;e>i;i++)if(!this.isInputComplete(i)){t=!1;break}return t},s.prototype.getReceivingAddresses=function(t){t||(t="livenet"),ret=[];for(var e=0;e<this.outs.length;e++){var i=this.outs[e],s=n.fromScriptPubKey(i.getScript(),t)[0].toString();ret.push(s)}return ret},s.prototype.getSendingAddresses=function(t){var e=[];t||(t="livenet");for(var i=0;i<this.ins.length;i++){var s=this.ins[i],r=s.getScript();if(0!==r.getBuffer().length){var o=n.fromScriptSig(r,t);e.push(o?o.toString():null)}else e.push(null)}return e},module.exports=s}).call(this,require("buffer").Buffer);
-},{"../config":"4itQ50","../util":189,"../util/BinaryParser":"b3ZSD7","../util/error":188,"../util/log":"AdF7pF","./Address":"G+CcXD","./PrivateKey":"izTl9z","./Script":"hQ0t76","./ScriptInterpreter":"Q/ZWXW","./WalletKey":"wWje7g","bignum":59,"buffer":93,"bufferput":"aXRuS6","buffertools":"fugeBw","step":176}],"./lib/TransactionBuilder":[function(require,module,exports){
+(function(t){function e(e){if("object"!=typeof e&&(e={}),e.o)this.o=e.o;else if(e.oTxHash&&"undefined"!=typeof e.oIndex&&e.oIndex>=0){var i=new t(e.oTxHash,"hex");i=p.reverse(i);var s=new t(4);s.writeUInt32LE(e.oIndex,0),this.o=t.concat([i,s])}this.s=t.isBuffer(e.s)?e.s:t.isBuffer(e.script)?e.script:h.EMPTY_BUFFER,this.q=e.q?e.q:e.sequence}function i(t){"object"!=typeof t&&(t={}),this.v=t.v?t.v:t.value,this.s=t.s?t.s:t.script}function s(t){"object"!=typeof t&&(t={}),this.hash=t.hash||null,this.version=t.version,this.lock_time=t.lock_time,this.ins=Array.isArray(t.ins)?t.ins.map(function(t){var i=new e;return i.s=t.s,i.q=t.q,i.o=t.o,i}):[],this.outs=Array.isArray(t.outs)?t.outs.map(function(t){var e=new i;return e.v=t.v,e.s=t.s,e}):[],t.buffer&&(this._buffer=t.buffer)}{var n=(require("../config"),require("../util/log"),require("./Address")),r=require("./Script"),o=require("./ScriptInterpreter"),h=require("../util"),u=require("bignum"),a=require("bufferput"),f=require("../util/BinaryParser"),p=(require("step"),require("buffertools")),c=(require("../util/error"),require("./WalletKey"),require("./PrivateKey"),require("preconditions").singleton()),l=t.concat([h.NULL_HASH,new t("FFFFFFFF","hex")]);parseInt(1e-4*h.COIN)}s.COINBASE_OP=l,e.MAX_SEQUENCE=4294967295,e.prototype.getScript=function(){return new r(this.s)},e.prototype.isCoinBase=function(){return this.o?0===p.compare(new t(this.o),l):!1},e.prototype.serialize=function(){var e=h.varIntBuf(this.s.length),i=new t(4);i.writeUInt32LE(this.q,0);var s=t.concat([this.o,e,this.s,i]);return s},e.prototype.getOutpointHash=function(){return"undefined"!=typeof this.o.outHashCache?this.o.outHashCache:this.o.outHashCache=this.o.slice(0,32)},e.prototype.getOutpointIndex=function(){return this.o[32]+(this.o[33]<<8)+(this.o[34]<<16)+(this.o[35]<<24)},e.prototype.setOutpointIndex=function(t){this.o[32]=255&t,this.o[33]=t>>8&255,this.o[34]=t>>16&255,this.o[35]=t>>24&255},i.prototype.getValue=function(){return new f(this.v).word64lu()},i.prototype.getScript=function(){return new r(this.s)},i.prototype.serialize=function(){var e=h.varIntBuf(this.s.length);return t.concat([this.v,e,this.s])},s.In=e,s.Out=i,s.prototype.isCoinBase=function(){return 1==this.ins.length&&this.ins[0].isCoinBase()},s.prototype.isStandard=function(){var t;for(t=0;t<this.ins.length;t++)if("Strange"==this.ins[t].getScript().getInType())return!1;for(t=0;t<this.outs.length;t++)if("Strange"==this.outs[t].getScript().getOutType())return!1;return!0},s.prototype.serialize=function(){var e=[],i=new t(4);i.writeUInt32LE(this.version,0),e.push(i),e.push(h.varIntBuf(this.ins.length)),this.ins.forEach(function(t){e.push(t.serialize())}),e.push(h.varIntBuf(this.outs.length)),this.outs.forEach(function(t){e.push(t.serialize())});var i=new t(4);return i.writeUInt32LE(this.lock_time,0),e.push(i),this._buffer=t.concat(e),this._buffer},s.prototype.getBuffer=function(){return this._buffer?this._buffer:this.serialize()},s.prototype.calcHash=function(){return this.hash=h.twoSha256(this.getBuffer()),this.hash},s.prototype.checkHash=function(){return this.hash&&this.hash.length?0===p.compare(this.calcHash(),this.hash):!1},s.prototype.getHash=function(){return this.hash&&this.hash.length||(this.hash=this.calcHash()),this.hash},s.prototype.calcNormalizedHash=function(){return this.normalizedHash=this.hashForSignature(new r,0,v),this.normalizedHash},s.prototype.getNormalizedHash=function(){return this.normalizedHash&&this.normalizedHash.length||(this.normalizedHash=this.calcNormalizedHash()),this.normalizedHash},s.prototype.inputs=function(){for(var t=[],e=0;e<this.ins.length;e++){var i=this.ins[e],s=i.getOutpointHash(),n=i.getOutpointIndex();t.push([s,n])}return t},s.prototype.verifyInput=function(t,e,i,s){var n=this.ins[t].getScript();return o.verifyFull(n,e,this,t,0,i,s)},s.prototype.getAffectedKeys=function(t){if(!this.affects||!this.affects.length){this.affects=[];for(var e=0,i=this.outs.length;i>e;e++){var s=this.outs[e],n=s.getScript(),r=n.simpleOutPubKeyHash();r&&this.affects.push(r)}for(var o=t.txIndex,e=0,i=this.ins.length;i>e;e++){var h=this.ins[e];if(!h.isCoinBase()){var u=h.getOutpointHash(),a=h.getOutpointIndex(),f=u.toString("base64"),p=o[f];if(!p)throw new Error("Input not found!");var s=p[a],n=s.getScript(),r=n.simpleOutPubKeyHash();r&&this.affects.push(r)}}}var c={};return this.affects.forEach(function(t){c[t.toString("base64")]=t}),c};var g=171,v=s.SIGHASH_ALL=o.SIGHASH_ALL,y=s.SIGHASH_NONE=o.SIGHASH_NONE,S=s.SIGHASH_SINGLE=o.SIGHASH_SINGLE,I=s.SIGHASH_ANYONECANPAY=o.SIGHASH_ANYONECANPAY,d=function(t,e,i,s){this.txTo=t,this.scriptCode=e,this.nIn=i,this.anyoneCanPay=!!(s&I);var n=31&s;this.hashSingle=n===S,this.hashNone=n===y,this.bytes=new a};d.prototype.serializeOutput=function(t){if(this.hashSingle&&t!=this.nIn)this.bytes.put(h.INT64_MAX),this.bytes.varint(0);else{var e=this.txTo.outs[t];this.bytes.put(e.v),this.bytes.varint(e.s.length),this.bytes.put(e.s)}},d.prototype.serializeScriptCode=function(){this.scriptCode.findAndDelete(g),this.bytes.varint(this.scriptCode.buffer.length),this.bytes.put(this.scriptCode.buffer)},d.prototype.serializeInput=function(t){this.anyoneCanPay&&(t=this.nIn),this.bytes.put(this.txTo.ins[t].o),t!==this.nIn?this.bytes.varint(0):this.serializeScriptCode(),this.bytes.word32le(t!==this.nIn&&(this.hashSingle||this.hashNone)?0:this.txTo.ins[t].q)},d.prototype.serialize=function(){this.bytes.word32le(this.txTo.version);var t=this.anyoneCanPay?1:this.txTo.ins.length;this.bytes.varint(t);for(var e=0;t>e;e++)this.serializeInput(e);var i=this.hashNone?0:this.hashSingle?this.nIn+1:this.txTo.outs.length;this.bytes.varint(i);for(var s=0;i>s;s++)this.serializeOutput(s);this.bytes.word32le(this.txTo.lock_time)},d.prototype.buffer=function(){return this.serialize(),this.bytes.buffer()},s.Serializer=d;var b=function(){var e=new t(32);e.writeUInt8(1,0);for(var i=1;32>i;i++)e.writeUInt8(0,i);return e};s.prototype.getHashType=function(t){c.checkArgument(t<this.ins.length);var e=this.ins[t],i=e.getScript();return i.getHashType()},s.prototype.hashForSignature=function(e,i,s){if(+i!==i||0>i||i>=this.ins.length)return b();var n=31&s;if(n===S&&i>=this.outs.length)return b();var r=new d(this,e,i,s),o=r.buffer(),u=(new a).word32le(s).buffer();return o=t.concat([o,u]),h.twoSha256(o)},s.prototype.getStandardizedObject=function(){var e={hash:h.formatHashFull(this.getHash()),version:this.version,lock_time:this.lock_time},i=8;i+=h.getVarIntSize(this.ins.length);var s=this.ins.map(function(e){var s={prev_out:{hash:p.reverse(new t(e.getOutpointHash())).toString("hex"),n:e.getOutpointIndex()},sequence:e.q};return e.isCoinBase()?s.coinbase=e.s.toString("hex"):s.scriptSig=new r(e.s).getStringContent(!1,0),i+=36+h.getVarIntSize(e.s.length)+e.s.length+4,s});i+=h.getVarIntSize(this.outs.length);var n=this.outs.map(function(t){return i+=h.getVarIntSize(t.s.length)+t.s.length+8,{value:h.formatValue(t.v),scriptPubKey:new r(t.s).getStringContent(!1,0)}});return e.size=i,e["in"]=s,e.out=n,e},s.prototype.toObject=function(){return this},s.prototype.fromObj=function(s){var o={};o.version=s.version||1,o.lock_time=s.lock_time||0,o.ins=[],o.outs=[],s.inputs.forEach(function(i){var s=new e;s.s=h.EMPTY_BUFFER,s.q=4294967295;var n=new t(i.txid,"hex");n=p.reverse(n);var r=parseInt(i.vout),u=new t(4);u.writeUInt32LE(r,0),s.o=t.concat([n,u]),o.ins.push(s)});var a=Object.keys(s.outputs);a.forEach(function(t){var e=new n(t),a=r.createPubKeyHashOut(e.payload()),f=u(s.outputs[t]),p=h.bigIntToValue(f),c=new i;c.v=p,c.s=a.getBuffer(),o.outs.push(c)}),this.lock_time=o.lock_time,this.version=o.version,this.ins=o.ins,this.outs=o.outs},s.prototype.parse=function(s){t.isBuffer(s)&&(this._buffer=s,s=new f(s));{var n;s.pos}this.version=s.word32le();var r=s.varInt();for(this.ins=[],j=0;r>j;j++){var o=new e;o.o=s.buffer(36),n=s.varInt(),o.s=s.buffer(n),o.q=s.word32le(),this.ins.push(o)}var h=s.varInt();for(this.outs=[],j=0;h>j;j++){var u=new i;u.v=s.buffer(8),n=s.varInt(),u.s=s.buffer(n),this.outs.push(u)}this.lock_time=s.word32le(),this.calcHash()},s.prototype.calcSize=function(){var t=8;return t+=h.getVarIntSize(this.ins.length),this.ins.forEach(function(e){t+=36+h.getVarIntSize(e.s.length)+e.s.length+4}),t+=h.getVarIntSize(this.outs.length),this.outs.forEach(function(e){t+=h.getVarIntSize(e.s.length)+e.s.length+8}),this.size=t,t},s.prototype.getSize=function(){return this.size||(this.size=this.calcSize()),this.size},s.prototype.countInputSignatures=function(t){var e=new r(this.ins[t].s);return e.countSignatures()},s.prototype.countInputMissingSignatures=function(t){var e=new r(this.ins[t].s);return e.countMissingSignatures()},s.prototype.isInputComplete=function(t){var e=this.countInputMissingSignatures(t);return null===e?null:0===e},s.prototype.isComplete=function(){for(var t=!0,e=this.ins.length,i=0;e>i;i++)if(!this.isInputComplete(i)){t=!1;break}return t},s.prototype.getReceivingAddresses=function(t){t||(t="livenet"),ret=[];for(var e=0;e<this.outs.length;e++){var i=this.outs[e],s=n.fromScriptPubKey(i.getScript(),t)[0].toString();ret.push(s)}return ret},s.prototype.getSendingAddresses=function(t){var e=[];t||(t="livenet");for(var i=0;i<this.ins.length;i++){var s=this.ins[i],r=s.getScript();if(0!==r.getBuffer().length){var o=n.fromScriptSig(r,t);e.push(o?o.toString():null)}else e.push(null)}return e},module.exports=s}).call(this,require("buffer").Buffer);
+},{"../config":"4itQ50","../util":189,"../util/BinaryParser":"b3ZSD7","../util/error":188,"../util/log":"AdF7pF","./Address":"G+CcXD","./PrivateKey":"izTl9z","./Script":"hQ0t76","./ScriptInterpreter":"Q/ZWXW","./WalletKey":"wWje7g","bignum":59,"buffer":93,"bufferput":"aXRuS6","buffertools":"fugeBw","preconditions":161,"step":176}],"./lib/TransactionBuilder":[function(require,module,exports){
 module.exports=require('D1Ge6m');
 },{}],"D1Ge6m":[function(require,module,exports){
 (function(t){"use strict";function e(t){return t=t||{},this.lockTime=t.lockTime||0,this.spendUnconfirmed=t.spendUnconfirmed||!1,(t.fee||t.feeSat)&&(this.givenFeeSat=t.fee?t.fee*n.COIN:t.feeSat),this.remainderOut=t.remainderOut,this.signhash=t.signhash||f.SIGHASH_ALL,this.tx={},this.inputsSigned=0,this.signaturesAdded=0,this}var r=require("./Address"),i=require("./Script"),n=require("../util"),s=require("bignum"),a=require("buffertools"),u=require("../networks"),o=require("./WalletKey"),h=require("./PrivateKey"),p=require("./Key"),c=require("../util/log"),f=require("./Transaction"),d=parseInt(1e-4*n.COIN);e.FEE_PER_1000B_SAT=d,e._scriptForPubkeys=function(e){for(var r=e.pubkeys.length,n=[],s=0;r>s;s++)n.push(new t(e.pubkeys[s],"hex"));return i.createMultisig(e.nreq,n)},e._scriptForOut=function(t){var e;if(t.address)e=new r(t.address).getScriptPubKey();else{if(!(t.pubkeys||t.nreq||t.nreq>1))throw new Error("unknown out type");e=this._scriptForPubkeys(t)}return e},e.infoForP2sh=function(t,e){var i=this._scriptForOut(t),s=n.sha256ripe160(i.getBuffer()),a="testnet"===e?u.testnet.P2SHVersion:u.livenet.P2SHVersion,o=new r(a,s),h=o.as("base58");return{script:i,scriptBufHex:i.getBuffer().toString("hex"),hash:s,address:h}},e.prototype.setUnspent=function(t){return this.utxos=t,this},e.prototype._setInputMap=function(){for(var e=[],r=this.selectedUtxos.length,n=0;r>n;n++){var s=this.selectedUtxos[n],a=new t(s.scriptPubKey,"hex"),u=new i(a),o=u.classify();if(o===i.TX_UNKNOWN)throw new Error("unkown output type at:"+n+" Type:"+u.getRawOutType());e.push({address:s.address,scriptPubKey:u,scriptType:o,i:n})}return this.inputMap=e,this},e.prototype.getSelectedUnspent=function(){return this.selectedUtxos},e.prototype._selectUnspent=function(t){if(!this.utxos||!this.utxos.length)throw new Error("unspent not set");var e=[6,1];this.spendUnconfirmed&&e.push(0);var r=[],i=s(0),a=!1,u=null,o=this.utxos.length;do{for(var h=e.shift(),p=0;o>p;p++){var c=this.utxos[p],f=c.confirmations||0;if(!(h>f||u&&f>=u)){var d=c.amountSat||n.parseValue(c.amount);if(i=i.add(d),r.push(c),i.cmp(t)>=0){a=!0;break}}}u=h}while(!a&&e.length);if(!a)throw new Error("not enough unspent tx outputs to fulfill totalNeededAmount [SAT]:"+t);return this.selectedUtxos=r,this._setInputMap(),this},e.prototype._setInputs=function(e){var r=this.selectedUtxos,i=r.length,u=s(0);e.ins=[];for(var o=0;i>o;o++){u=u.add(n.parseValue(r[o].amount));var h={};h.s=n.EMPTY_BUFFER,h.q=4294967295;var p=new t(r[o].txid,"hex"),c=a.reverse(p),f=parseInt(r[o].vout),d=new t(4);d.writeUInt32LE(f,0),h.o=t.concat([c,d]),e.ins.push(h)}return this.valueInSat=u,this},e.prototype._setFee=function(t){if("undefined"==typeof this.valueOutSat)throw new Error("valueOutSat undefined");var e=this.valueOutSat.add(t);if(this.valueInSat.cmp(e)<0){var r=this.valueInSat.toString(),i=e.toString();throw new Error("transaction input amount is less than outputs: "+r+" < "+i+" [SAT]")}return this.feeSat=t,this},e.prototype._setRemainder=function(t,r){if("undefined"==typeof this.valueInSat||"undefined"==typeof this.valueOutSat)throw new Error("valueInSat / valueOutSat undefined");var i=this.valueInSat.sub(this.valueOutSat).sub(this.feeSat),a=t.outs.length;if(this.remainderSat=s(0),a>r&&t.outs.pop(),i.cmp(0)>0){var u=this.remainderOut||this.selectedUtxos[0],o=n.bigIntToValue(i),h=e._scriptForOut(u),p={v:o,s:h.getBuffer()};t.outs.push(p),this.remainderSat=i}return this},e.prototype._setFeeAndRemainder=function(t){var e,r=500,i=t.outs.length;do{e=parseInt(r/1e3)+1;var n=this.givenFeeSat?this.givenFeeSat:e*d,s=this.valueOutSat.add(n);this._selectUnspent(s)._setInputs(t)._setFee(n)._setRemainder(t,i),r=new f(t).getSize()}while(r>1e3*(e+1));return this},e.prototype.setOutputs=function(t){var r=s(0),i={};i.version=1,i.lock_time=this.lockTime||0,i.ins=[],i.outs=[];for(var a=t.length,u=0;a>u;u++){var o=t[u].amountSat||n.parseValue(t[u].amount),h=n.bigIntToValue(o),p=e._scriptForOut(t[u]),c={v:h,s:p.getBuffer()};i.outs.push(c);var d=t[u].amountSat||n.parseValue(t[u].amount);r=r.add(d)}return this.valueOutSat=r,this._setFeeAndRemainder(i),this.tx=new f(i),this},e._mapKeys=function(t){for(var e,r={},i=t.length,n=0;i>n;n++){var s=t[n];if("string"==typeof s){var a=new h(s);e=new o({network:a.network()}),e.fromObj({priv:s})}else{if(!(s instanceof o))throw new Error("argument must be an array of strings (WIF format) or WalletKey objects");e=s}var u=e.storeObj().addr;r[u]=e}return r},e._signHashAndVerify=function(t,e){var r,i=10;do r=t.privKey.signSync(e);while(t.privKey.verifySignatureSync(e,r)===!1&&i--);if(0>i)throw new Error("could not sign input: verification failed");return r},e.prototype._checkTx=function(){if(!this.tx||!this.tx.ins.length||!this.tx.outs.length)throw new Error("tx is not defined")},e.prototype._multiFindKey=function(t,e){var i;return[u.livenet,u.testnet].forEach(function(n){[n.addressVersion,n.P2SHVersion].forEach(function(n){var s=new r(n,e);!i&&t[s]&&(i=t[s])})}),i},e.prototype._findWalletKey=function(t,e){var r;if(e.address)r=t[e.address];else if(e.pubKeyHash)r=this._multiFindKey(t,e.pubKeyHash);else{if(!e.pubKeyBuf)throw new Error("no infomation at input to find keys");var i=n.sha256ripe160(e.pubKeyBuf);r=this._multiFindKey(t,i)}return r},e.prototype._signPubKey=function(r,n,s){if(this.tx.ins[n.i].s.length>0)return{};var a=this._findWalletKey(r,n);if(a){var u=e._signHashAndVerify(a,s),o=new t(1);o[0]=this.signhash;var h=t.concat([u,o]),p=new i;return p.chunks.push(h),p.updateBuffer(),{inputFullySigned:!0,signaturesAdded:1,script:p.getBuffer()}}},e.prototype._signPubKeyHash=function(r,n,s){if(this.tx.ins[n.i].s.length>0)return{};var a=this._findWalletKey(r,n);if(a){var u=e._signHashAndVerify(a,s),o=new t(1);o[0]=this.signhash;var h=t.concat([u,o]),p=new i;return p.chunks.push(h),p.chunks.push(a.privKey.public),p.updateBuffer(),{inputFullySigned:!0,signaturesAdded:1,script:p.getBuffer()}}},e.prototype._chunkSignedWithKey=function(e,r,i){var n,s=new p;s.public=i;for(var a=1;a<=e.countSignatures();a++){var u=e.chunks[a],o=new t(u.slice(0,u.length-1));s.verifySignatureSync(r,o)&&(n=u)}return n},e.prototype._getSignatureOrder=function(e,r,i,n){for(var s=n.length,a=0;s>a;a++){var u=new p;if(u.public=new t(n[a],"hex"),u.verifySignatureSync(i,r))break}return a},e.prototype._getNewSignatureOrder=function(e,r,i,n){for(var s,a=1;a<=r.countSignatures();a++){var u=r.chunks[a],o=new t(u.slice(0,u.length-1));if(s=this._getSignatureOrder(e,o,i,n),s>=e)break}return e===s?-1:a-1},e.prototype._chunkIsEmpty=function(t){return 0===t||0===a.compare(t,n.EMPTY_BUFFER)},e.prototype._initMultiSig=function(t){var e=!1;return 0!==t.chunks[0]&&(t.prependOp0(),e=!0),e},e.prototype._updateMultiSig=function(r,i,n,s,a){var u=this._initMultiSig(n);if(this._chunkSignedWithKey(n,s,i.privKey.public))return null;var o=e._signHashAndVerify(i,s),h=new t(1);h[0]=this.signhash;var p=t.concat([o,h]),c=this._getNewSignatureOrder(r,n,s,a);return n.chunks.splice(c+1,0,p),n.updateBuffer(),u=!0,u?n:null},e.prototype._signMultiSig=function(t,e,r){for(var n=e.scriptPubKey.capture(),s=e.scriptPubKey.chunks[0]-80,a=n.length,u=this.tx.ins[e.i].s,o=new i(u),h=0,p=0;a>p&&o.countSignatures()<s;p++){var c=this._findWalletKey(t,{pubKeyBuf:n[p]});if(c){var f=this._updateMultiSig(p,c,o,r,n);f&&(o=f,h++)}}var d={inputFullySigned:o.countSignatures()===s,signaturesAdded:h,script:o.getBuffer()};return d};var g={};e.prototype._scriptIsAppended=function(t,e){var r=t.chunks.length;return void 0===t.chunks[r-1]?!1:"number"==typeof t.chunks[r-1]?!1:0!==a.compare(t.chunks[r-1],e)?!1:!0},e.prototype._addScript=function(t,e){var r=new i(t);return this._scriptIsAppended(r,e)||(r.chunks.push(e),r.updateBuffer()),r.getBuffer()},e.prototype._getInputForP2sh=function(t,e){var r,s=t.classify();switch(s){case i.TX_PUBKEYHASH:r=t.captureOne();break;case i.TX_PUBKEY:var a=t.captureOne();r=n.sha256ripe160(a)}return{i:e,pubKeyHash:r,scriptPubKey:t,scriptType:s,isP2sh:!0}},e.prototype._p2shInput=function(e){if(!this.hashToScriptMap)throw new Error("hashToScriptMap not set");var r=this.hashToScriptMap[e.address];if(r){var n=new t(r,"hex"),s=new i(n),a=s.classify();if(!g[a]||a===i.TX_SCRIPTHASH)throw new Error("dont know how to sign p2sh script type:"+s.getRawOutType());return{input:this._getInputForP2sh(s,e.i),txSigHash:this.tx.hashForSignature(s,e.i,this.signhash),scriptType:s.classify(),scriptBuf:n}}},e.prototype._signScriptHash=function(t,e){var r=this._p2shInput(e),i=g[r.scriptType].call(this,t,r.input,r.txSigHash);return i&&i.script&&i.signaturesAdded&&(i.script=this._addScript(i.script,r.scriptBuf)),i},g[i.TX_PUBKEYHASH]=e.prototype._signPubKeyHash,g[i.TX_PUBKEY]=e.prototype._signPubKey,g[i.TX_MULTISIG]=e.prototype._signMultiSig,g[i.TX_SCRIPTHASH]=e.prototype._signScriptHash,e.prototype.sign=function(t){this._checkTx();for(var r=this.tx,i=r.ins,n=i.length,s=e._mapKeys(t),a=0;n>a;a++){var u=this.inputMap[a],o=this.tx.hashForSignature(u.scriptPubKey,a,this.signhash),h=g[u.scriptType].call(this,s,u,o);h&&h.script&&(r.ins[a].s=h.script,h.inputFullySigned&&this.inputsSigned++,h.signaturesAdded&&(this.signaturesAdded+=h.signaturesAdded))}return this},e.prototype.setHashToScriptMap=function(t){return this.hashToScriptMap=t,this},e.prototype.isFullySigned=function(){return this.inputsSigned===this.tx.ins.length},e.prototype.build=function(){return this._checkTx(),this.tx},e.prototype.toObj=function(){var t={valueInSat:this.valueInSat.toString(),valueOutSat:this.valueOutSat.toString(),feeSat:this.feeSat.toString(),remainderSat:this.remainderSat.toString(),hashToScriptMap:this.hashToScriptMap,selectedUtxos:this.selectedUtxos,inputsSigned:this.inputsSigned,signaturesAdded:this.signaturesAdded,signhash:this.signhash,spendUnconfirmed:this.spendUnconfirmed};return this.tx&&(t.tx=this.tx.serialize().toString("hex")),t},e.fromObj=function(r){var i=new e;if(i.valueInSat=r.valueInSat.toString(),i.valueOutSat=r.valueOutSat.toString(),i.feeSat=r.feeSat.toString(),i.remainderSat=r.remainderSat.toString(),i.hashToScriptMap=r.hashToScriptMap,i.selectedUtxos=r.selectedUtxos,i.inputsSigned=r.inputsSigned,i.signaturesAdded=r.signaturesAdded,i.signhash=r.signhash,i.spendUnconfirmed=r.spendUnconfirmed,i._setInputMap(),r.tx){var n=new f;n.parse(new t(r.tx,"hex")),i.tx=n}return i},e.prototype._checkMergeability=function(t){var e=this;if(["valueInSat","valueOutSat","feeSat","remainderSat","signhash","spendUnconfirmed"].forEach(function(r){if(e[r].toString()!==t[r].toString())throw new Error("mismatch at TransactionBuilder match: "+r+": "+e[r]+" vs. "+t[r])}),e.hashToScriptMap){var r=0;if(t.hashToScriptMap||(r=1),Object.keys(e.hashToScriptMap).forEach(function(i){t.hashToScriptMap[i]||(r=1),e.hashToScriptMap[i]!==t.hashToScriptMap[i]&&(r=1)}),r)throw new Error("mismatch at TransactionBuilder hashToScriptMap")}var r=0,i=0;if(e.selectedUtxos.forEach(function(e){if(!r){var n=t.selectedUtxos[i++];n||(r=1),["address","hash","scriptPubKey","vout","amount"].forEach(function(t){e[t]!==n[t]&&(r=t)})}}),r)throw new Error("mismatch at TransactionBuilder selectedUtxos #"+i-1+" Key:"+r);if(r=0,i=0,e.inputMap.forEach(function(e){if(!r){var n=t.inputMap[i++];n||(r=1),["address","scriptType","scriptPubKey","i"].forEach(function(t){e[t].toString()!==n[t].toString()&&(r=t)})}}),r)throw new Error("mismatch at TransactionBuilder inputMap #"+i-1+" Key:"+r)},e.prototype._mergeInputSigP2sh=function(t,e,r){for(var n=this._p2shInput(t),s=new i(n.scriptBuf),a=s.capture(),u={},o=a.length,h=0;o>h;h++)this._chunkSignedWithKey(e,n.txSigHash,a[h])&&(u[a[h].toString("hex")]=1);for(var p=[],h=0;o>h;h++){var c=this._chunkSignedWithKey(r,n.txSigHash,a[h]),f=a[h].toString("hex");c&&!u[f]&&p.push({prio:h,chunk:c,pubHex:f})}for(var h in p){var d=p[h],g=this._getNewSignatureOrder(d.prio,e,n.txSigHash,a);e.chunks.splice(g+1,0,d.chunk),this.signaturesAdded++}return e.updateBuffer(),e.getBuffer()},e.prototype._mergeInputSig=function(t,e,r){if(0===a.compare(e,r))return e;var n=new i(e),s=new i(r),u=n.chunks.length,o=s.chunks.length;if(u&&o&&(2>u&&o>2||2>o&&u>2))throw new Error("TX sig types mismatch in merge");if(!u&&!o||u&&!o||!u&&o)return r;var h=this.inputMap[t],p=h.scriptPubKey.classify();if(p===i.TX_PUBKEYHASH||p===i.TX_PUBKEY)return c.debug("Merging two signed inputs type:"+h.scriptPubKey.getRawOutType()+". Signatures differs. Using the first version."),e;if(p!==i.TX_SCRIPTHASH)throw new Error("Script type:"+h.scriptPubKey.getRawOutType()+"not supported at #merge");return this._mergeInputSigP2sh(h,n,s)},e.prototype._mergeTx=function(t){var e=this.tx,r=t,i=e.ins.length;if(i!==r.ins.length)throw new Error("TX in length mismatch in merge");this.inputsSigned=0;for(var n=0;i>n;n++){var s=e.ins[n],u=r.ins[n];if(s.q!==u.q)throw new Error("TX sequence ins mismatch in merge. Input:",n);if(0!==a.compare(s.o,u.o))throw new Error("TX .o in mismatch in merge. Input:",n);s.s=this._mergeInputSig(n,s.s,u.s),e.isInputComplete(n)&&this.inputsSigned++}},e.prototype.merge=function(t){if(this._checkMergeability(t),this.tx||t.tx){if(this.tx.getNormalizedHash().toString("hex")!==t.tx.getNormalizedHash().toString("hex"))throw new Error("mismatch at TransactionBuilder NTXID");this._mergeTx(t.tx)}},module.exports=e}).call(this,require("buffer").Buffer);
diff --git a/lib/NetworkMonitor.js b/lib/NetworkMonitor.js
index 19ccaa6..b9a9b68 100644
--- a/lib/NetworkMonitor.js
+++ b/lib/NetworkMonitor.js
@@ -17,6 +17,7 @@ var NetworkMonitor = function(peerman) {
 util.inherits(NetworkMonitor, EventEmitter);
 
 NetworkMonitor.create = function(config) {
+  this.config = config;
   var peerman = new PeerManager({
     network: config.networkName
   });
diff --git a/lib/Script.js b/lib/Script.js
index c1ced7b..6f73243 100644
--- a/lib/Script.js
+++ b/lib/Script.js
@@ -115,6 +115,13 @@ Script.prototype.isMultiSig = function() {
     this.chunks[this.chunks.length - 1] == Opcode.map.OP_CHECKMULTISIG);
 };
 
+Script.prototype.isPubkeyHashScript = function() {
+  // TODO: add more restrictions to chunks
+  return (this.chunks.length == 2 &&
+    Buffer.isBuffer(this.chunks[0]) &&
+    Buffer.isBuffer(this.chunks[1]));
+};
+
 Script.prototype.isP2shScriptSig = function() {
   if (!isSmallIntOp(this.chunks[0]) || this.chunks[0] !== 0)
     return false;
@@ -133,20 +140,65 @@ Script.prototype.isMultiSigScriptSig = function() {
 Script.prototype.countSignatures = function() {
   var ret = 0;
   var l = this.chunks.length;
-
   // Multisig?
   if (this.isMultiSigScriptSig()) {
     ret = l - 1;
-  } else if (this.isP2shScriptSig()) {
+  }
+  // p2sh
+  else if (this.isP2shScriptSig()) {
     ret = l - 2;
   }
-  // p2pubkey or p2pubkeyhash
+  // p2pubkeyhash
+  else if (this.isPubkeyHashScript()) {
+    ret = 1;
+  }
+  // p2pubkey
   else {
-    ret = buffertools.compare(this.getBuffer(), util.EMPTY_BUFFER) === 0 ? 0 : 1;
+    ret = 0;
   }
   return ret;
 };
 
+
+Script.prototype.getSignatures = function() {
+  ret = [];
+  var l = this.chunks.length;
+  // Multisig?
+  if (this.isMultiSigScriptSig()) {
+    for(var i = 1; i<l; i++) {
+      ret.push(this.chunks[i]);
+    } 
+  }
+  // p2sh
+  else if (this.isP2shScriptSig()) {
+    for (var i=1; i<l-1; i++) {
+      ret.push(this.chunks[i]);
+    }
+  }
+  // p2pubkeyhash
+  else if (this.isPubkeyHashScript()) {
+    ret.push(this.chunks[0]);
+  }
+  // p2pubkey
+  else {
+    // no signatures
+  }
+  return ret;
+};
+
+Script.prototype.getHashType = function() {
+  var sigs = this.getSignatures();
+  var hashType = null;
+  for (var i=0; i<sigs.length; i++) {
+    var sig = sigs[i];
+    var hashTypeI = sig[sig.length - 1];
+    if (hashType !== null && hashType !== hashTypeI) return null;
+    hashType = hashTypeI;
+  }
+  return hashType;
+};
+
+
 Script.prototype.countMissingSignatures = function() {
   if (this.isMultiSig()) {
     log.debug("Can not count missing signatures on normal Multisig script");
diff --git a/lib/Transaction.js b/lib/Transaction.js
index 7d8bce5..f06e7b6 100644
--- a/lib/Transaction.js
+++ b/lib/Transaction.js
@@ -12,6 +12,7 @@ var buffertools = require('buffertools');
 var error = require('../util/error');
 var WalletKey = require('./WalletKey');
 var PrivateKey = require('./PrivateKey');
+var preconditions = require('preconditions').singleton();
 
 var COINBASE_OP = Buffer.concat([util.NULL_HASH, new Buffer('FFFFFFFF', 'hex')]);
 var FEE_PER_1000B_SAT = parseInt(0.0001 * util.COIN);
@@ -400,6 +401,13 @@ var oneBuffer = function() {
   return ret; // return 1 bug
 };
 
+Transaction.prototype.getHashType = function(inIndex) {
+  preconditions.checkArgument(inIndex < this.ins.length);
+  var input = this.ins[inIndex];
+  var scriptSig = input.getScript();
+  return scriptSig.getHashType();
+};
+
 Transaction.prototype.hashForSignature =
   function hashForSignature(script, inIndex, hashType) {