diff --git a/Cargo.lock b/Cargo.lock
index b49b52a8..f439fc73 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3,7 +3,7 @@ name = "pbtc"
 version = "0.1.0"
 dependencies = [
  "chain 0.1.0",
- "clap 2.16.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clap 2.16.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "db 0.1.0",
  "env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "keys 0.1.0",
@@ -98,7 +98,7 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "2.16.1"
+version = "2.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -163,7 +163,7 @@ version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.1.77 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -208,7 +208,7 @@ name = "gcc"
 version = "0.3.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rayon 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rayon 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -367,14 +367,6 @@ dependencies = [
  "tokio-core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "num_cpus"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "num_cpus"
 version = "1.1.0"
@@ -455,29 +447,30 @@ dependencies = [
 
 [[package]]
 name = "rayon"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "deque 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "regex"
-version = "0.1.77"
+version = "0.1.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.3.7"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -717,7 +710,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
 "checksum byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855"
 "checksum cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de1e760d7b6535af4241fca8bd8adf68e2e7edacc6b29f5d399050c5e48cf88c"
-"checksum clap 2.16.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7d3f517329dfa6300c8415693c54e524f777dc470265bd73dfd1ff1699c3ee30"
+"checksum clap 2.16.2 (registry+https://github.com/rust-lang/crates.io-index)" = "08aac7b078ec0a58e1d4b43cfb11d47001f8eb7c6f6f2bda4f5eed43c82491f1"
 "checksum crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0c5ea215664ca264da8a9d9c3be80d2eaf30923c259d03e870388eb927508f97"
 "checksum deque 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1614659040e711785ed8ea24219140654da1729f3ec8a47a9719d041112fe7bf"
 "checksum domain 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "725459994103308a8476a95d8115280b1359dccc06ca14291df75f37459a9e30"
@@ -741,7 +734,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum nix 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a7bb1da2be7da3cbffda73fc681d509ffd9e665af478d2bee1907cee0bc64b2"
 "checksum nodrop 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "0dbbadd3f4c98dea0bd3d9b4be4c0cdaf1ab57035cb2e41fce3983db5add7cc5"
 "checksum ns-dns-tokio 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "43330aab5077c311b390b62147feb44316cb5b754b97d28c92210e6c6b7baff7"
-"checksum num_cpus 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "cee7e88156f3f9e19bdd598f8d6c9db7bf4078f99f8381f43a55b09648d1a6e3"
 "checksum num_cpus 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8890e6084723d57d0df8d2720b0d60c6ee67d6c93e7169630e4371e88765dcad"
 "checksum odds 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)" = "e04630a62b3f1cc8c58b4d8f2555a40136f02b420e158242936ef286a72d33a0"
 "checksum owning_ref 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8d91377085359426407a287ab16884a0111ba473aa6844ff01d4ec20ce3d75e7"
@@ -749,9 +741,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum parking_lot_core 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fb1b97670a2ffadce7c397fb80a3d687c4f3060140b885621ef1653d0e5d5068"
 "checksum quick-error 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0aad603e8d7fb67da22dbdf1f4b826ce8829e406124109e73cf1b2454b93a71c"
 "checksum rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "2791d88c6defac799c3f20d74f094ca33b9332612d9aef9078519c82e4fe04a5"
-"checksum rayon 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "655df67c314c30fa3055a365eae276eb88aa4f3413a352a1ab32c1320eda41ea"
-"checksum regex 0.1.77 (registry+https://github.com/rust-lang/crates.io-index)" = "64b03446c466d35b42f2a8b203c8e03ed8b91c0f17b56e1f84f7210a257aa665"
-"checksum regex-syntax 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "48f0573bcee95a48da786f8823465b5f2a1fae288a55407aca991e5b3e0eae11"
+"checksum rayon 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0f0783f5880c56f5a308e219ac9309dbe781e064741dd5def4c617c440890305"
+"checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f"
+"checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957"
 "checksum rocksdb 0.4.5 (git+https://github.com/ethcore/rust-rocksdb)" = "<none>"
 "checksum rocksdb-sys 0.3.0 (git+https://github.com/ethcore/rust-rocksdb)" = "<none>"
 "checksum rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)" = "f76d05d3993fd5f4af9434e8e436db163a12a9d40e1a58a726f27a01dfd12a2a"
diff --git a/tools/graph.dot b/tools/graph.dot
index 0032b90c..9f64ac5a 100644
--- a/tools/graph.dot
+++ b/tools/graph.dot
@@ -1,77 +1,77 @@
 digraph dependencies {
 	N0[label="pbtc",shape=box];
-	N1[label="clap",shape=box];
-	N2[label="db",shape=box];
-	N3[label="env_logger",shape=box];
-	N4[label="keys",shape=box];
-	N5[label="message",shape=box];
-	N6[label="miner",shape=box];
-	N7[label="p2p",shape=box];
-	N8[label="script",shape=box];
-	N9[label="sync",shape=box];
-	N10[label="verification",shape=box];
-	N11[label="abstract-ns",shape=box];
-	N12[label="futures",shape=box];
-	N13[label="quick-error",shape=box];
-	N14[label="rand",shape=box];
-	N15[label="aho-corasick",shape=box];
-	N16[label="memchr",shape=box];
-	N17[label="ansi_term",shape=box];
-	N18[label="arrayvec",shape=box];
-	N19[label="nodrop",shape=box];
-	N20[label="odds",shape=box];
-	N21[label="base58",shape=box];
-	N22[label="bitcrypto",shape=box];
-	N23[label="primitives",shape=box];
-	N24[label="rust-crypto",shape=box];
-	N25[label="bitflags v0.4.0",shape=box];
-	N26[label="bitflags v0.7.0",shape=box];
-	N27[label="byteorder",shape=box];
-	N28[label="cfg-if",shape=box];
-	N29[label="chain",shape=box];
-	N30[label="heapsize",shape=box];
-	N31[label="rustc-serialize",shape=box];
-	N32[label="serialization",shape=box];
-	N33[label="libc",shape=box];
-	N34[label="strsim",shape=box];
-	N35[label="term_size",shape=box];
-	N36[label="unicode-segmentation",shape=box];
-	N37[label="unicode-width",shape=box];
-	N38[label="vec_map",shape=box];
-	N39[label="yaml-rust",shape=box];
-	N40[label="crossbeam",shape=box];
-	N41[label="elastic-array",shape=box];
-	N42[label="ethcore-devtools",shape=box];
-	N43[label="parking_lot",shape=box];
-	N44[label="rocksdb",shape=box];
-	N45[label="test-data",shape=box];
-	N46[label="deque",shape=box];
-	N47[label="domain",shape=box];
-	N48[label="tokio-core",shape=box];
-	N49[label="log",shape=box];
-	N50[label="regex",shape=box];
-	N51[label="eth-secp256k1",shape=box];
-	N52[label="gcc",shape=box];
-	N53[label="futures-cpupool",shape=box];
-	N54[label="num_cpus v1.1.0",shape=box];
-	N55[label="rayon",shape=box];
-	N56[label="kernel32-sys",shape=box];
-	N57[label="winapi",shape=box];
-	N58[label="winapi-build",shape=box];
-	N59[label="lazy_static",shape=box];
-	N60[label="lazycell",shape=box];
-	N61[label="linked-hash-map",shape=box];
-	N62[label="mio",shape=box];
-	N63[label="miow",shape=box];
-	N64[label="net2",shape=box];
-	N65[label="nix",shape=box];
-	N66[label="slab",shape=box];
-	N67[label="ws2_32-sys",shape=box];
-	N68[label="rustc_version",shape=box];
-	N69[label="semver",shape=box];
-	N70[label="void",shape=box];
-	N71[label="ns-dns-tokio",shape=box];
-	N72[label="num_cpus v0.2.13",shape=box];
+	N1[label="chain",shape=box];
+	N2[label="clap",shape=box];
+	N3[label="db",shape=box];
+	N4[label="env_logger",shape=box];
+	N5[label="keys",shape=box];
+	N6[label="message",shape=box];
+	N7[label="miner",shape=box];
+	N8[label="p2p",shape=box];
+	N9[label="script",shape=box];
+	N10[label="sync",shape=box];
+	N11[label="verification",shape=box];
+	N12[label="abstract-ns",shape=box];
+	N13[label="futures",shape=box];
+	N14[label="quick-error",shape=box];
+	N15[label="rand",shape=box];
+	N16[label="aho-corasick",shape=box];
+	N17[label="memchr",shape=box];
+	N18[label="ansi_term",shape=box];
+	N19[label="arrayvec",shape=box];
+	N20[label="nodrop",shape=box];
+	N21[label="odds",shape=box];
+	N22[label="base58",shape=box];
+	N23[label="bit-vec",shape=box];
+	N24[label="bitcrypto",shape=box];
+	N25[label="primitives",shape=box];
+	N26[label="rust-crypto",shape=box];
+	N27[label="bitflags v0.4.0",shape=box];
+	N28[label="bitflags v0.7.0",shape=box];
+	N29[label="byteorder",shape=box];
+	N30[label="cfg-if",shape=box];
+	N31[label="heapsize",shape=box];
+	N32[label="rustc-serialize",shape=box];
+	N33[label="serialization",shape=box];
+	N34[label="libc",shape=box];
+	N35[label="strsim",shape=box];
+	N36[label="term_size",shape=box];
+	N37[label="unicode-segmentation",shape=box];
+	N38[label="unicode-width",shape=box];
+	N39[label="vec_map",shape=box];
+	N40[label="yaml-rust",shape=box];
+	N41[label="crossbeam",shape=box];
+	N42[label="elastic-array",shape=box];
+	N43[label="ethcore-devtools",shape=box];
+	N44[label="parking_lot",shape=box];
+	N45[label="rocksdb",shape=box];
+	N46[label="test-data",shape=box];
+	N47[label="deque",shape=box];
+	N48[label="domain",shape=box];
+	N49[label="tokio-core",shape=box];
+	N50[label="log",shape=box];
+	N51[label="regex",shape=box];
+	N52[label="eth-secp256k1",shape=box];
+	N53[label="gcc",shape=box];
+	N54[label="futures-cpupool",shape=box];
+	N55[label="num_cpus",shape=box];
+	N56[label="rayon",shape=box];
+	N57[label="kernel32-sys",shape=box];
+	N58[label="winapi",shape=box];
+	N59[label="winapi-build",shape=box];
+	N60[label="lazy_static",shape=box];
+	N61[label="lazycell",shape=box];
+	N62[label="linked-hash-map",shape=box];
+	N63[label="mio",shape=box];
+	N64[label="miow",shape=box];
+	N65[label="net2",shape=box];
+	N66[label="nix",shape=box];
+	N67[label="slab",shape=box];
+	N68[label="ws2_32-sys",shape=box];
+	N69[label="rustc_version",shape=box];
+	N70[label="semver",shape=box];
+	N71[label="void",shape=box];
+	N72[label="ns-dns-tokio",shape=box];
 	N73[label="owning_ref",shape=box];
 	N74[label="time",shape=box];
 	N75[label="parking_lot_core",shape=box];
@@ -92,188 +92,193 @@ digraph dependencies {
 	N0 -> N8[label="",style=dashed];
 	N0 -> N9[label="",style=dashed];
 	N0 -> N10[label="",style=dashed];
-	N1 -> N17[label="",style=dashed];
-	N1 -> N26[label="",style=dashed];
+	N0 -> N11[label="",style=dashed];
+	N1 -> N24[label="",style=dashed];
+	N1 -> N25[label="",style=dashed];
+	N1 -> N31[label="",style=dashed];
+	N1 -> N32[label="",style=dashed];
 	N1 -> N33[label="",style=dashed];
-	N1 -> N34[label="",style=dashed];
-	N1 -> N35[label="",style=dashed];
-	N1 -> N36[label="",style=dashed];
-	N1 -> N37[label="",style=dashed];
-	N1 -> N38[label="",style=dashed];
-	N1 -> N39[label="",style=dashed];
-	N2 -> N23[label="",style=dashed];
-	N2 -> N27[label="",style=dashed];
-	N2 -> N29[label="",style=dashed];
-	N2 -> N32[label="",style=dashed];
-	N2 -> N41[label="",style=dashed];
-	N2 -> N42[label="",style=dashed];
-	N2 -> N43[label="",style=dashed];
-	N2 -> N44[label="",style=dashed];
-	N2 -> N45[label="",style=dashed];
-	N3 -> N49[label="",style=dashed];
-	N3 -> N50[label="",style=dashed];
-	N4 -> N14[label="",style=dashed];
-	N4 -> N21[label="",style=dashed];
-	N4 -> N22[label="",style=dashed];
-	N4 -> N23[label="",style=dashed];
-	N4 -> N31[label="",style=dashed];
+	N2 -> N18[label="",style=dashed];
+	N2 -> N28[label="",style=dashed];
+	N2 -> N34[label="",style=dashed];
+	N2 -> N35[label="",style=dashed];
+	N2 -> N36[label="",style=dashed];
+	N2 -> N37[label="",style=dashed];
+	N2 -> N38[label="",style=dashed];
+	N2 -> N39[label="",style=dashed];
+	N2 -> N40[label="",style=dashed];
+	N3 -> N1[label="",style=dashed];
+	N3 -> N23[label="",style=dashed];
+	N3 -> N25[label="",style=dashed];
+	N3 -> N29[label="",style=dashed];
+	N3 -> N33[label="",style=dashed];
+	N3 -> N42[label="",style=dashed];
+	N3 -> N43[label="",style=dashed];
+	N3 -> N44[label="",style=dashed];
+	N3 -> N45[label="",style=dashed];
+	N3 -> N46[label="",style=dashed];
+	N4 -> N50[label="",style=dashed];
 	N4 -> N51[label="",style=dashed];
-	N4 -> N59[label="",style=dashed];
+	N5 -> N15[label="",style=dashed];
 	N5 -> N22[label="",style=dashed];
-	N5 -> N23[label="",style=dashed];
-	N5 -> N27[label="",style=dashed];
-	N5 -> N29[label="",style=dashed];
+	N5 -> N24[label="",style=dashed];
+	N5 -> N25[label="",style=dashed];
 	N5 -> N32[label="",style=dashed];
-	N6 -> N23[label="",style=dashed];
+	N5 -> N52[label="",style=dashed];
+	N5 -> N60[label="",style=dashed];
+	N6 -> N1[label="",style=dashed];
+	N6 -> N24[label="",style=dashed];
+	N6 -> N25[label="",style=dashed];
 	N6 -> N29[label="",style=dashed];
-	N6 -> N30[label="",style=dashed];
-	N6 -> N32[label="",style=dashed];
-	N6 -> N45[label="",style=dashed];
-	N7 -> N5[label="",style=dashed];
-	N7 -> N11[label="",style=dashed];
-	N7 -> N12[label="",style=dashed];
-	N7 -> N14[label="",style=dashed];
-	N7 -> N22[label="",style=dashed];
-	N7 -> N23[label="",style=dashed];
-	N7 -> N43[label="",style=dashed];
-	N7 -> N48[label="",style=dashed];
-	N7 -> N49[label="",style=dashed];
-	N7 -> N53[label="",style=dashed];
-	N7 -> N71[label="",style=dashed];
-	N7 -> N74[label="",style=dashed];
-	N8 -> N4[label="",style=dashed];
-	N8 -> N22[label="",style=dashed];
-	N8 -> N23[label="",style=dashed];
-	N8 -> N29[label="",style=dashed];
-	N8 -> N32[label="",style=dashed];
+	N6 -> N33[label="",style=dashed];
+	N7 -> N1[label="",style=dashed];
+	N7 -> N25[label="",style=dashed];
+	N7 -> N31[label="",style=dashed];
+	N7 -> N33[label="",style=dashed];
+	N7 -> N46[label="",style=dashed];
+	N8 -> N6[label="",style=dashed];
+	N8 -> N12[label="",style=dashed];
+	N8 -> N13[label="",style=dashed];
+	N8 -> N15[label="",style=dashed];
+	N8 -> N24[label="",style=dashed];
+	N8 -> N25[label="",style=dashed];
+	N8 -> N44[label="",style=dashed];
+	N8 -> N49[label="",style=dashed];
+	N8 -> N50[label="",style=dashed];
+	N8 -> N54[label="",style=dashed];
+	N8 -> N72[label="",style=dashed];
+	N8 -> N74[label="",style=dashed];
+	N9 -> N1[label="",style=dashed];
 	N9 -> N5[label="",style=dashed];
-	N9 -> N7[label="",style=dashed];
-	N9 -> N23[label="",style=dashed];
-	N9 -> N29[label="",style=dashed];
-	N9 -> N43[label="",style=dashed];
-	N9 -> N49[label="",style=dashed];
-	N10 -> N2[label="",style=dashed];
+	N9 -> N24[label="",style=dashed];
+	N9 -> N25[label="",style=dashed];
+	N9 -> N33[label="",style=dashed];
+	N10 -> N1[label="",style=dashed];
+	N10 -> N3[label="",style=dashed];
+	N10 -> N6[label="",style=dashed];
 	N10 -> N8[label="",style=dashed];
-	N10 -> N23[label="",style=dashed];
-	N10 -> N27[label="",style=dashed];
-	N10 -> N29[label="",style=dashed];
-	N10 -> N32[label="",style=dashed];
-	N10 -> N42[label="",style=dashed];
-	N10 -> N43[label="",style=dashed];
-	N10 -> N45[label="",style=dashed];
-	N10 -> N61[label="",style=dashed];
-	N10 -> N74[label="",style=dashed];
-	N11 -> N12[label="",style=dashed];
-	N11 -> N13[label="",style=dashed];
-	N11 -> N14[label="",style=dashed];
-	N12 -> N49[label="",style=dashed];
-	N14 -> N33[label="",style=dashed];
-	N15 -> N16[label="",style=dashed];
-	N16 -> N33[label="",style=dashed];
-	N18 -> N19[label=""];
-	N18 -> N20[label=""];
+	N10 -> N11[label="",style=dashed];
+	N10 -> N25[label="",style=dashed];
+	N10 -> N44[label="",style=dashed];
+	N10 -> N50[label="",style=dashed];
+	N10 -> N62[label="",style=dashed];
+	N11 -> N1[label="",style=dashed];
+	N11 -> N3[label="",style=dashed];
+	N11 -> N9[label="",style=dashed];
+	N11 -> N25[label="",style=dashed];
+	N11 -> N29[label="",style=dashed];
+	N11 -> N33[label="",style=dashed];
+	N11 -> N43[label="",style=dashed];
+	N11 -> N44[label="",style=dashed];
+	N11 -> N46[label="",style=dashed];
+	N11 -> N62[label="",style=dashed];
+	N11 -> N74[label="",style=dashed];
+	N12 -> N13[label="",style=dashed];
+	N12 -> N14[label="",style=dashed];
+	N12 -> N15[label="",style=dashed];
+	N13 -> N50[label="",style=dashed];
+	N15 -> N34[label="",style=dashed];
+	N16 -> N17[label="",style=dashed];
+	N17 -> N34[label="",style=dashed];
 	N19 -> N20[label=""];
-	N22 -> N23[label="",style=dashed];
-	N22 -> N24[label="",style=dashed];
-	N23 -> N30[label="",style=dashed];
-	N23 -> N31[label="",style=dashed];
-	N24 -> N14[label="",style=dashed];
-	N24 -> N31[label="",style=dashed];
-	N24 -> N33[label="",style=dashed];
-	N24 -> N52[label="",style=dashed];
-	N24 -> N74[label="",style=dashed];
-	N29 -> N22[label="",style=dashed];
-	N29 -> N23[label="",style=dashed];
-	N29 -> N30[label="",style=dashed];
-	N29 -> N31[label="",style=dashed];
-	N29 -> N32[label="",style=dashed];
-	N30 -> N56[label="",style=dashed];
-	N32 -> N23[label="",style=dashed];
-	N32 -> N27[label="",style=dashed];
-	N35 -> N33[label="",style=dashed];
-	N35 -> N56[label="",style=dashed];
-	N35 -> N57[label="",style=dashed];
-	N42 -> N14[label="",style=dashed];
-	N43 -> N73[label="",style=dashed];
-	N43 -> N75[label="",style=dashed];
-	N44 -> N33[label="",style=dashed];
-	N44 -> N80[label="",style=dashed];
-	N45 -> N23[label="",style=dashed];
-	N45 -> N29[label="",style=dashed];
-	N45 -> N32[label="",style=dashed];
-	N46 -> N14[label="",style=dashed];
-	N47 -> N12[label="",style=dashed];
-	N47 -> N14[label="",style=dashed];
-	N47 -> N27[label="",style=dashed];
-	N47 -> N48[label="",style=dashed];
-	N48 -> N12[label="",style=dashed];
+	N19 -> N21[label=""];
+	N20 -> N21[label=""];
+	N24 -> N25[label="",style=dashed];
+	N24 -> N26[label="",style=dashed];
+	N25 -> N31[label="",style=dashed];
+	N25 -> N32[label="",style=dashed];
+	N26 -> N15[label="",style=dashed];
+	N26 -> N32[label="",style=dashed];
+	N26 -> N34[label="",style=dashed];
+	N26 -> N53[label="",style=dashed];
+	N26 -> N74[label="",style=dashed];
+	N31 -> N57[label="",style=dashed];
+	N33 -> N25[label="",style=dashed];
+	N33 -> N29[label="",style=dashed];
+	N36 -> N34[label="",style=dashed];
+	N36 -> N57[label="",style=dashed];
+	N36 -> N58[label="",style=dashed];
+	N43 -> N15[label="",style=dashed];
+	N44 -> N73[label="",style=dashed];
+	N44 -> N75[label="",style=dashed];
+	N45 -> N34[label="",style=dashed];
+	N45 -> N80[label="",style=dashed];
+	N46 -> N1[label="",style=dashed];
+	N46 -> N25[label="",style=dashed];
+	N46 -> N33[label="",style=dashed];
+	N47 -> N15[label="",style=dashed];
+	N48 -> N13[label="",style=dashed];
+	N48 -> N15[label="",style=dashed];
+	N48 -> N29[label="",style=dashed];
 	N48 -> N49[label="",style=dashed];
-	N48 -> N62[label="",style=dashed];
-	N48 -> N66[label="",style=dashed];
-	N48 -> N81[label="",style=dashed];
-	N50 -> N15[label="",style=dashed];
-	N50 -> N16[label="",style=dashed];
-	N50 -> N77[label="",style=dashed];
-	N50 -> N78[label="",style=dashed];
-	N50 -> N79[label="",style=dashed];
-	N51 -> N14[label="",style=dashed];
-	N51 -> N18[label="",style=dashed];
-	N51 -> N31[label="",style=dashed];
-	N51 -> N33[label="",style=dashed];
-	N51 -> N52[label="",style=dashed];
-	N52 -> N55[label="",style=dashed];
-	N53 -> N12[label="",style=dashed];
-	N53 -> N40[label="",style=dashed];
-	N53 -> N54[label="",style=dashed];
-	N54 -> N33[label="",style=dashed];
-	N55 -> N14[label="",style=dashed];
-	N55 -> N46[label="",style=dashed];
-	N55 -> N72[label="",style=dashed];
-	N56 -> N57[label="",style=dashed];
-	N56 -> N58[label="",style=dashed];
-	N62 -> N33[label="",style=dashed];
-	N62 -> N49[label="",style=dashed];
-	N62 -> N56[label="",style=dashed];
-	N62 -> N57[label="",style=dashed];
-	N62 -> N60[label="",style=dashed];
-	N62 -> N63[label="",style=dashed];
-	N62 -> N64[label="",style=dashed];
-	N62 -> N65[label="",style=dashed];
-	N62 -> N66[label="",style=dashed];
-	N63 -> N56[label="",style=dashed];
+	N49 -> N13[label="",style=dashed];
+	N49 -> N50[label="",style=dashed];
+	N49 -> N63[label="",style=dashed];
+	N49 -> N67[label="",style=dashed];
+	N49 -> N81[label="",style=dashed];
+	N51 -> N16[label="",style=dashed];
+	N51 -> N17[label="",style=dashed];
+	N51 -> N77[label="",style=dashed];
+	N51 -> N78[label="",style=dashed];
+	N51 -> N79[label="",style=dashed];
+	N52 -> N15[label="",style=dashed];
+	N52 -> N19[label="",style=dashed];
+	N52 -> N32[label="",style=dashed];
+	N52 -> N34[label="",style=dashed];
+	N52 -> N53[label="",style=dashed];
+	N53 -> N56[label="",style=dashed];
+	N54 -> N13[label="",style=dashed];
+	N54 -> N41[label="",style=dashed];
+	N54 -> N55[label="",style=dashed];
+	N55 -> N34[label="",style=dashed];
+	N56 -> N15[label="",style=dashed];
+	N56 -> N34[label="",style=dashed];
+	N56 -> N47[label="",style=dashed];
+	N56 -> N55[label="",style=dashed];
+	N57 -> N58[label="",style=dashed];
+	N57 -> N59[label="",style=dashed];
+	N63 -> N34[label="",style=dashed];
+	N63 -> N50[label="",style=dashed];
 	N63 -> N57[label="",style=dashed];
+	N63 -> N58[label="",style=dashed];
+	N63 -> N61[label="",style=dashed];
 	N63 -> N64[label="",style=dashed];
+	N63 -> N65[label="",style=dashed];
+	N63 -> N66[label="",style=dashed];
 	N63 -> N67[label="",style=dashed];
-	N64 -> N28[label="",style=dashed];
-	N64 -> N33[label="",style=dashed];
-	N64 -> N56[label="",style=dashed];
 	N64 -> N57[label="",style=dashed];
-	N64 -> N67[label="",style=dashed];
-	N65 -> N25[label="",style=dashed];
-	N65 -> N28[label="",style=dashed];
-	N65 -> N33[label="",style=dashed];
+	N64 -> N58[label="",style=dashed];
+	N64 -> N65[label="",style=dashed];
+	N64 -> N68[label="",style=dashed];
+	N65 -> N30[label="",style=dashed];
+	N65 -> N34[label="",style=dashed];
+	N65 -> N57[label="",style=dashed];
+	N65 -> N58[label="",style=dashed];
 	N65 -> N68[label="",style=dashed];
-	N65 -> N69[label="",style=dashed];
-	N65 -> N70[label="",style=dashed];
-	N67 -> N57[label="",style=dashed];
-	N67 -> N58[label="",style=dashed];
-	N68 -> N69[label="",style=dashed];
-	N71 -> N11[label="",style=dashed];
-	N71 -> N12[label="",style=dashed];
-	N71 -> N47[label="",style=dashed];
-	N71 -> N48[label="",style=dashed];
-	N72 -> N33[label="",style=dashed];
-	N74 -> N33[label="",style=dashed];
-	N74 -> N56[label="",style=dashed];
+	N66 -> N27[label="",style=dashed];
+	N66 -> N30[label="",style=dashed];
+	N66 -> N34[label="",style=dashed];
+	N66 -> N69[label="",style=dashed];
+	N66 -> N70[label="",style=dashed];
+	N66 -> N71[label="",style=dashed];
+	N68 -> N58[label="",style=dashed];
+	N68 -> N59[label="",style=dashed];
+	N69 -> N70[label="",style=dashed];
+	N72 -> N12[label="",style=dashed];
+	N72 -> N13[label="",style=dashed];
+	N72 -> N48[label="",style=dashed];
+	N72 -> N49[label="",style=dashed];
+	N74 -> N34[label="",style=dashed];
 	N74 -> N57[label="",style=dashed];
-	N75 -> N14[label="",style=dashed];
-	N75 -> N33[label="",style=dashed];
-	N75 -> N56[label="",style=dashed];
+	N74 -> N58[label="",style=dashed];
+	N75 -> N15[label="",style=dashed];
+	N75 -> N34[label="",style=dashed];
 	N75 -> N57[label="",style=dashed];
+	N75 -> N58[label="",style=dashed];
 	N75 -> N76[label="",style=dashed];
 	N78 -> N82[label="",style=dashed];
-	N80 -> N33[label="",style=dashed];
-	N80 -> N52[label="",style=dashed];
-	N82 -> N33[label="",style=dashed];
-	N82 -> N56[label="",style=dashed];
+	N80 -> N34[label="",style=dashed];
+	N80 -> N53[label="",style=dashed];
+	N82 -> N34[label="",style=dashed];
+	N82 -> N57[label="",style=dashed];
 }
diff --git a/tools/graph.png b/tools/graph.png
index d70befb2..81e0245d 100644
Binary files a/tools/graph.png and b/tools/graph.png differ