diff --git a/Cargo.lock b/Cargo.lock
index 0fc8da37..0ada53b9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -90,7 +90,7 @@ version = "0.1.0"
 dependencies = [
  "primitives 0.1.0",
  "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
- "siphasher 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "siphasher 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -238,7 +238,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -446,7 +446,7 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -565,7 +565,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "deque 0.3.1 (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)",
+ "num_cpus 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -685,7 +685,7 @@ dependencies = [
 
 [[package]]
 name = "siphasher"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -889,7 +889,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum nix 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a0d95c5fa8b641c10ad0b8887454ebaafa3c92b5cd5350f8fc693adafd178e7b"
 "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 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8890e6084723d57d0df8d2720b0d60c6ee67d6c93e7169630e4371e88765dcad"
+"checksum num_cpus 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "55aabf4e2d6271a2e4e4c0f2ea1f5b07cc589cc1a9e9213013b54a76678ca4f3"
 "checksum odds 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)" = "c3df9b730298cea3a1c3faa90b7e2f9df3a9c400d0936d6015e6165734eefcba"
 "checksum ole32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2c49021782e5233cd243168edfa8037574afed4eba4bbaf538b3d8d1789d8c"
 "checksum owning_ref 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8d91377085359426407a287ab16884a0111ba473aa6844ff01d4ec20ce3d75e7"
@@ -910,7 +910,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum scopeguard 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "59a076157c1e2dc561d8de585151ee6965d910dd4dcb5dabb7ae3e83981a6c57"
 "checksum semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac"
 "checksum shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "72f20b8f3c060374edb8046591ba28f62448c369ccbdc7b02075103fb3a9e38d"
-"checksum siphasher 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b1c3c58c9ac43c530919fe6bd8ef11ae2612f64c2bf8eab9346f5b71ce0617f2"
+"checksum siphasher 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "833011ca526bd88f16778d32c699d325a9ad302fa06381cd66f7be63351d3f6d"
 "checksum slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23"
 "checksum smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "fcc8d19212aacecf95e4a7a2179b26f7aeb9732a915cf01f05b0d3e044865410"
 "checksum strsim 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "67f84c44fbb2f91db7fef94554e6b2ac05909c9c0b0bc23bb98d3a1aebfe7f7c"
diff --git a/tools/graph.dot b/tools/graph.dot
index 71c0fbb8..c9bf010a 100644
--- a/tools/graph.dot
+++ b/tools/graph.dot
@@ -9,89 +9,93 @@ digraph dependencies {
 	N7[label="import",shape=box];
 	N8[label="keys",shape=box];
 	N9[label="log",shape=box];
-	N10[label="message",shape=box];
-	N11[label="miner",shape=box];
-	N12[label="network",shape=box];
-	N13[label="p2p",shape=box];
-	N14[label="script",shape=box];
-	N15[label="sync",shape=box];
-	N16[label="verification",shape=box];
-	N17[label="abstract-ns",shape=box];
-	N18[label="futures",shape=box];
-	N19[label="quick-error",shape=box];
-	N20[label="rand",shape=box];
-	N21[label="aho-corasick",shape=box];
-	N22[label="memchr",shape=box];
-	N23[label="ansi_term",shape=box];
-	N24[label="ole32-sys",shape=box];
-	N25[label="shell32-sys",shape=box];
-	N26[label="winapi",shape=box];
-	N27[label="xdg",shape=box];
-	N28[label="arrayvec",shape=box];
-	N29[label="nodrop",shape=box];
-	N30[label="odds",shape=box];
-	N31[label="base58",shape=box];
-	N32[label="ethcore-devtools",shape=box];
-	N33[label="primitives",shape=box];
-	N34[label="test-data",shape=box];
-	N35[label="time",shape=box];
-	N36[label="bit-vec",shape=box];
-	N37[label="bitcrypto",shape=box];
-	N38[label="rust-crypto",shape=box];
-	N39[label="siphasher",shape=box];
-	N40[label="bitflags v0.4.0",shape=box];
-	N41[label="bitflags v0.7.0",shape=box];
-	N42[label="byteorder",shape=box];
-	N43[label="cfg-if",shape=box];
-	N44[label="heapsize",shape=box];
-	N45[label="rustc-serialize",shape=box];
-	N46[label="serialization",shape=box];
-	N47[label="libc",shape=box];
-	N48[label="strsim",shape=box];
-	N49[label="term_size",shape=box];
-	N50[label="unicode-segmentation",shape=box];
-	N51[label="unicode-width",shape=box];
-	N52[label="vec_map",shape=box];
-	N53[label="yaml-rust",shape=box];
-	N54[label="crossbeam",shape=box];
-	N55[label="csv",shape=box];
-	N56[label="elastic-array",shape=box];
-	N57[label="parking_lot",shape=box];
-	N58[label="rocksdb",shape=box];
-	N59[label="deque",shape=box];
-	N60[label="domain",shape=box];
-	N61[label="tokio-core",shape=box];
-	N62[label="regex",shape=box];
-	N63[label="eth-secp256k1",shape=box];
-	N64[label="gcc",shape=box];
-	N65[label="futures-cpupool",shape=box];
-	N66[label="num_cpus",shape=box];
-	N67[label="rayon",shape=box];
-	N68[label="kernel32-sys",shape=box];
-	N69[label="winapi-build",shape=box];
-	N70[label="lazy_static",shape=box];
-	N71[label="lazycell",shape=box];
-	N72[label="linked-hash-map",shape=box];
-	N73[label="mio",shape=box];
-	N74[label="miow",shape=box];
-	N75[label="net2",shape=box];
-	N76[label="nix",shape=box];
-	N77[label="slab",shape=box];
-	N78[label="ws2_32-sys",shape=box];
-	N79[label="murmur3",shape=box];
-	N80[label="rustc_version",shape=box];
-	N81[label="semver",shape=box];
-	N82[label="void",shape=box];
-	N83[label="ns-dns-tokio",shape=box];
-	N84[label="owning_ref",shape=box];
-	N85[label="parking_lot_core",shape=box];
-	N86[label="smallvec",shape=box];
-	N87[label="regex-syntax",shape=box];
-	N88[label="thread_local",shape=box];
-	N89[label="utf8-ranges",shape=box];
-	N90[label="rocksdb-sys",shape=box];
-	N91[label="scoped-tls",shape=box];
-	N92[label="thread-id",shape=box];
+	N10[label="logs",shape=box];
+	N11[label="message",shape=box];
+	N12[label="miner",shape=box];
+	N13[label="network",shape=box];
+	N14[label="p2p",shape=box];
+	N15[label="script",shape=box];
+	N16[label="sync",shape=box];
+	N17[label="verification",shape=box];
+	N18[label="abstract-ns",shape=box];
+	N19[label="futures",shape=box];
+	N20[label="quick-error",shape=box];
+	N21[label="rand",shape=box];
+	N22[label="aho-corasick",shape=box];
+	N23[label="memchr",shape=box];
+	N24[label="ansi_term",shape=box];
+	N25[label="ole32-sys",shape=box];
+	N26[label="shell32-sys",shape=box];
+	N27[label="winapi",shape=box];
+	N28[label="xdg",shape=box];
+	N29[label="arrayvec",shape=box];
+	N30[label="nodrop",shape=box];
+	N31[label="odds",shape=box];
+	N32[label="base58",shape=box];
+	N33[label="ethcore-devtools",shape=box];
+	N34[label="primitives",shape=box];
+	N35[label="test-data",shape=box];
+	N36[label="time",shape=box];
+	N37[label="bit-vec",shape=box];
+	N38[label="bitcrypto",shape=box];
+	N39[label="rust-crypto",shape=box];
+	N40[label="siphasher",shape=box];
+	N41[label="bitflags v0.4.0",shape=box];
+	N42[label="bitflags v0.7.0",shape=box];
+	N43[label="byteorder",shape=box];
+	N44[label="cfg-if",shape=box];
+	N45[label="heapsize",shape=box];
+	N46[label="rustc-serialize",shape=box];
+	N47[label="serialization",shape=box];
+	N48[label="libc",shape=box];
+	N49[label="strsim",shape=box];
+	N50[label="term_size",shape=box];
+	N51[label="unicode-segmentation",shape=box];
+	N52[label="unicode-width",shape=box];
+	N53[label="vec_map",shape=box];
+	N54[label="yaml-rust",shape=box];
+	N55[label="crossbeam",shape=box];
+	N56[label="csv",shape=box];
+	N57[label="elastic-array",shape=box];
+	N58[label="parking_lot",shape=box];
+	N59[label="rocksdb",shape=box];
+	N60[label="deque",shape=box];
+	N61[label="domain",shape=box];
+	N62[label="tokio-core",shape=box];
+	N63[label="regex",shape=box];
+	N64[label="eth-secp256k1",shape=box];
+	N65[label="gcc",shape=box];
+	N66[label="futures-cpupool",shape=box];
+	N67[label="num_cpus",shape=box];
+	N68[label="rayon",shape=box];
+	N69[label="kernel32-sys",shape=box];
+	N70[label="winapi-build",shape=box];
+	N71[label="lazy_static",shape=box];
+	N72[label="lazycell",shape=box];
+	N73[label="linked-hash-map",shape=box];
+	N74[label="mio",shape=box];
+	N75[label="miow",shape=box];
+	N76[label="net2",shape=box];
+	N77[label="nix",shape=box];
+	N78[label="slab",shape=box];
+	N79[label="ws2_32-sys",shape=box];
+	N80[label="murmur3",shape=box];
+	N81[label="rustc_version",shape=box];
+	N82[label="semver",shape=box];
+	N83[label="void",shape=box];
+	N84[label="ns-dns-tokio",shape=box];
+	N85[label="owning_ref",shape=box];
+	N86[label="parking_lot_core",shape=box];
+	N87[label="smallvec",shape=box];
+	N88[label="regex-syntax",shape=box];
+	N89[label="thread_local",shape=box];
+	N90[label="utf8-ranges",shape=box];
+	N91[label="rocksdb-sys",shape=box];
+	N92[label="scoped-pool",shape=box];
+	N93[label="scopeguard",shape=box];
+	N94[label="variance",shape=box];
+	N95[label="scoped-tls",shape=box];
+	N96[label="thread-id",shape=box];
 	N0 -> N1[label="",style=dashed];
 	N0 -> N2[label="",style=dashed];
 	N0 -> N3[label="",style=dashed];
@@ -108,244 +112,253 @@ digraph dependencies {
 	N0 -> N14[label="",style=dashed];
 	N0 -> N15[label="",style=dashed];
 	N0 -> N16[label="",style=dashed];
-	N1 -> N24[label="",style=dashed];
+	N0 -> N17[label="",style=dashed];
 	N1 -> N25[label="",style=dashed];
 	N1 -> N26[label="",style=dashed];
 	N1 -> N27[label="",style=dashed];
+	N1 -> N28[label="",style=dashed];
 	N2 -> N3[label="",style=dashed];
 	N2 -> N5[label="",style=dashed];
-	N2 -> N16[label="",style=dashed];
-	N2 -> N32[label="",style=dashed];
+	N2 -> N17[label="",style=dashed];
 	N2 -> N33[label="",style=dashed];
 	N2 -> N34[label="",style=dashed];
 	N2 -> N35[label="",style=dashed];
-	N3 -> N33[label="",style=dashed];
-	N3 -> N37[label="",style=dashed];
-	N3 -> N44[label="",style=dashed];
+	N2 -> N36[label="",style=dashed];
+	N3 -> N34[label="",style=dashed];
+	N3 -> N38[label="",style=dashed];
 	N3 -> N45[label="",style=dashed];
 	N3 -> N46[label="",style=dashed];
-	N4 -> N23[label="",style=dashed];
-	N4 -> N41[label="",style=dashed];
-	N4 -> N47[label="",style=dashed];
+	N3 -> N47[label="",style=dashed];
+	N4 -> N24[label="",style=dashed];
+	N4 -> N42[label="",style=dashed];
 	N4 -> N48[label="",style=dashed];
 	N4 -> N49[label="",style=dashed];
 	N4 -> N50[label="",style=dashed];
 	N4 -> N51[label="",style=dashed];
 	N4 -> N52[label="",style=dashed];
 	N4 -> N53[label="",style=dashed];
+	N4 -> N54[label="",style=dashed];
 	N5 -> N3[label="",style=dashed];
 	N5 -> N9[label="",style=dashed];
-	N5 -> N32[label="",style=dashed];
 	N5 -> N33[label="",style=dashed];
 	N5 -> N34[label="",style=dashed];
-	N5 -> N36[label="",style=dashed];
-	N5 -> N42[label="",style=dashed];
-	N5 -> N46[label="",style=dashed];
-	N5 -> N56[label="",style=dashed];
+	N5 -> N35[label="",style=dashed];
+	N5 -> N37[label="",style=dashed];
+	N5 -> N43[label="",style=dashed];
+	N5 -> N47[label="",style=dashed];
 	N5 -> N57[label="",style=dashed];
 	N5 -> N58[label="",style=dashed];
+	N5 -> N59[label="",style=dashed];
 	N6 -> N9[label="",style=dashed];
-	N6 -> N62[label="",style=dashed];
+	N6 -> N63[label="",style=dashed];
 	N7 -> N3[label="",style=dashed];
 	N7 -> N9[label="",style=dashed];
-	N7 -> N33[label="",style=dashed];
-	N7 -> N46[label="",style=dashed];
-	N8 -> N20[label="",style=dashed];
-	N8 -> N31[label="",style=dashed];
-	N8 -> N33[label="",style=dashed];
-	N8 -> N37[label="",style=dashed];
-	N8 -> N45[label="",style=dashed];
-	N8 -> N63[label="",style=dashed];
-	N8 -> N70[label="",style=dashed];
-	N10 -> N3[label="",style=dashed];
-	N10 -> N12[label="",style=dashed];
-	N10 -> N33[label="",style=dashed];
-	N10 -> N37[label="",style=dashed];
-	N10 -> N42[label="",style=dashed];
-	N10 -> N46[label="",style=dashed];
+	N7 -> N34[label="",style=dashed];
+	N7 -> N47[label="",style=dashed];
+	N8 -> N21[label="",style=dashed];
+	N8 -> N32[label="",style=dashed];
+	N8 -> N34[label="",style=dashed];
+	N8 -> N38[label="",style=dashed];
+	N8 -> N46[label="",style=dashed];
+	N8 -> N64[label="",style=dashed];
+	N8 -> N71[label="",style=dashed];
+	N10 -> N6[label="",style=dashed];
+	N10 -> N9[label="",style=dashed];
+	N10 -> N24[label="",style=dashed];
+	N10 -> N36[label="",style=dashed];
 	N11 -> N3[label="",style=dashed];
-	N11 -> N5[label="",style=dashed];
-	N11 -> N33[label="",style=dashed];
+	N11 -> N13[label="",style=dashed];
 	N11 -> N34[label="",style=dashed];
-	N11 -> N44[label="",style=dashed];
-	N11 -> N46[label="",style=dashed];
+	N11 -> N38[label="",style=dashed];
+	N11 -> N43[label="",style=dashed];
+	N11 -> N47[label="",style=dashed];
 	N12 -> N3[label="",style=dashed];
-	N12 -> N33[label="",style=dashed];
-	N12 -> N46[label="",style=dashed];
-	N13 -> N9[label="",style=dashed];
-	N13 -> N10[label="",style=dashed];
-	N13 -> N12[label="",style=dashed];
-	N13 -> N17[label="",style=dashed];
-	N13 -> N18[label="",style=dashed];
-	N13 -> N20[label="",style=dashed];
-	N13 -> N33[label="",style=dashed];
-	N13 -> N35[label="",style=dashed];
-	N13 -> N37[label="",style=dashed];
-	N13 -> N46[label="",style=dashed];
-	N13 -> N55[label="",style=dashed];
-	N13 -> N57[label="",style=dashed];
-	N13 -> N61[label="",style=dashed];
-	N13 -> N65[label="",style=dashed];
-	N13 -> N83[label="",style=dashed];
-	N14 -> N3[label="",style=dashed];
-	N14 -> N8[label="",style=dashed];
+	N12 -> N5[label="",style=dashed];
+	N12 -> N34[label="",style=dashed];
+	N12 -> N35[label="",style=dashed];
+	N12 -> N45[label="",style=dashed];
+	N12 -> N47[label="",style=dashed];
+	N13 -> N3[label="",style=dashed];
+	N13 -> N34[label="",style=dashed];
+	N13 -> N47[label="",style=dashed];
 	N14 -> N9[label="",style=dashed];
-	N14 -> N33[label="",style=dashed];
-	N14 -> N37[label="",style=dashed];
-	N14 -> N46[label="",style=dashed];
+	N14 -> N11[label="",style=dashed];
+	N14 -> N13[label="",style=dashed];
+	N14 -> N18[label="",style=dashed];
+	N14 -> N19[label="",style=dashed];
+	N14 -> N21[label="",style=dashed];
+	N14 -> N34[label="",style=dashed];
+	N14 -> N36[label="",style=dashed];
+	N14 -> N38[label="",style=dashed];
+	N14 -> N47[label="",style=dashed];
+	N14 -> N56[label="",style=dashed];
+	N14 -> N58[label="",style=dashed];
+	N14 -> N62[label="",style=dashed];
+	N14 -> N66[label="",style=dashed];
+	N14 -> N84[label="",style=dashed];
 	N15 -> N3[label="",style=dashed];
-	N15 -> N5[label="",style=dashed];
+	N15 -> N8[label="",style=dashed];
 	N15 -> N9[label="",style=dashed];
-	N15 -> N10[label="",style=dashed];
-	N15 -> N11[label="",style=dashed];
-	N15 -> N12[label="",style=dashed];
-	N15 -> N13[label="",style=dashed];
-	N15 -> N14[label="",style=dashed];
-	N15 -> N16[label="",style=dashed];
-	N15 -> N18[label="",style=dashed];
-	N15 -> N20[label="",style=dashed];
-	N15 -> N32[label="",style=dashed];
-	N15 -> N33[label="",style=dashed];
 	N15 -> N34[label="",style=dashed];
-	N15 -> N35[label="",style=dashed];
-	N15 -> N36[label="",style=dashed];
-	N15 -> N37[label="",style=dashed];
-	N15 -> N42[label="",style=dashed];
-	N15 -> N46[label="",style=dashed];
-	N15 -> N57[label="",style=dashed];
-	N15 -> N61[label="",style=dashed];
-	N15 -> N65[label="",style=dashed];
-	N15 -> N72[label="",style=dashed];
-	N15 -> N79[label="",style=dashed];
+	N15 -> N38[label="",style=dashed];
+	N15 -> N47[label="",style=dashed];
 	N16 -> N3[label="",style=dashed];
 	N16 -> N5[label="",style=dashed];
 	N16 -> N9[label="",style=dashed];
+	N16 -> N11[label="",style=dashed];
 	N16 -> N12[label="",style=dashed];
+	N16 -> N13[label="",style=dashed];
 	N16 -> N14[label="",style=dashed];
-	N16 -> N32[label="",style=dashed];
+	N16 -> N15[label="",style=dashed];
+	N16 -> N17[label="",style=dashed];
+	N16 -> N19[label="",style=dashed];
+	N16 -> N21[label="",style=dashed];
 	N16 -> N33[label="",style=dashed];
 	N16 -> N34[label="",style=dashed];
 	N16 -> N35[label="",style=dashed];
-	N16 -> N42[label="",style=dashed];
-	N16 -> N46[label="",style=dashed];
-	N16 -> N57[label="",style=dashed];
-	N16 -> N72[label="",style=dashed];
-	N17 -> N18[label="",style=dashed];
-	N17 -> N19[label="",style=dashed];
-	N17 -> N20[label="",style=dashed];
-	N18 -> N9[label="",style=dashed];
-	N20 -> N47[label="",style=dashed];
-	N21 -> N22[label="",style=dashed];
-	N22 -> N47[label="",style=dashed];
-	N24 -> N26[label="",style=dashed];
-	N24 -> N69[label="",style=dashed];
-	N25 -> N26[label="",style=dashed];
-	N25 -> N69[label="",style=dashed];
-	N28 -> N29[label=""];
-	N28 -> N30[label=""];
+	N16 -> N36[label="",style=dashed];
+	N16 -> N37[label="",style=dashed];
+	N16 -> N38[label="",style=dashed];
+	N16 -> N43[label="",style=dashed];
+	N16 -> N47[label="",style=dashed];
+	N16 -> N58[label="",style=dashed];
+	N16 -> N62[label="",style=dashed];
+	N16 -> N66[label="",style=dashed];
+	N16 -> N73[label="",style=dashed];
+	N16 -> N80[label="",style=dashed];
+	N17 -> N3[label="",style=dashed];
+	N17 -> N5[label="",style=dashed];
+	N17 -> N9[label="",style=dashed];
+	N17 -> N13[label="",style=dashed];
+	N17 -> N15[label="",style=dashed];
+	N17 -> N33[label="",style=dashed];
+	N17 -> N34[label="",style=dashed];
+	N17 -> N35[label="",style=dashed];
+	N17 -> N36[label="",style=dashed];
+	N17 -> N43[label="",style=dashed];
+	N17 -> N47[label="",style=dashed];
+	N17 -> N58[label="",style=dashed];
+	N17 -> N73[label="",style=dashed];
+	N17 -> N92[label="",style=dashed];
+	N18 -> N19[label="",style=dashed];
+	N18 -> N20[label="",style=dashed];
+	N18 -> N21[label="",style=dashed];
+	N19 -> N9[label="",style=dashed];
+	N21 -> N48[label="",style=dashed];
+	N22 -> N23[label="",style=dashed];
+	N23 -> N48[label="",style=dashed];
+	N25 -> N27[label="",style=dashed];
+	N25 -> N70[label="",style=dashed];
+	N26 -> N27[label="",style=dashed];
+	N26 -> N70[label="",style=dashed];
 	N29 -> N30[label=""];
-	N32 -> N20[label="",style=dashed];
-	N33 -> N44[label="",style=dashed];
-	N33 -> N45[label="",style=dashed];
-	N33 -> N80[label="",style=dashed];
-	N34 -> N3[label="",style=dashed];
-	N34 -> N33[label="",style=dashed];
-	N34 -> N35[label="",style=dashed];
+	N29 -> N31[label=""];
+	N30 -> N31[label=""];
+	N33 -> N21[label="",style=dashed];
+	N34 -> N45[label="",style=dashed];
 	N34 -> N46[label="",style=dashed];
-	N35 -> N26[label="",style=dashed];
+	N34 -> N81[label="",style=dashed];
+	N35 -> N3[label="",style=dashed];
+	N35 -> N34[label="",style=dashed];
+	N35 -> N36[label="",style=dashed];
 	N35 -> N47[label="",style=dashed];
-	N35 -> N68[label="",style=dashed];
-	N37 -> N33[label="",style=dashed];
-	N37 -> N38[label="",style=dashed];
-	N37 -> N39[label="",style=dashed];
-	N38 -> N20[label="",style=dashed];
-	N38 -> N35[label="",style=dashed];
-	N38 -> N45[label="",style=dashed];
-	N38 -> N47[label="",style=dashed];
-	N38 -> N64[label="",style=dashed];
-	N44 -> N68[label="",style=dashed];
-	N46 -> N33[label="",style=dashed];
-	N46 -> N42[label="",style=dashed];
-	N49 -> N26[label="",style=dashed];
-	N49 -> N47[label="",style=dashed];
-	N49 -> N68[label="",style=dashed];
-	N55 -> N42[label="",style=dashed];
-	N55 -> N45[label="",style=dashed];
-	N57 -> N84[label="",style=dashed];
-	N57 -> N85[label="",style=dashed];
-	N58 -> N47[label="",style=dashed];
-	N58 -> N90[label="",style=dashed];
-	N59 -> N20[label="",style=dashed];
-	N60 -> N18[label="",style=dashed];
-	N60 -> N20[label="",style=dashed];
-	N60 -> N42[label="",style=dashed];
-	N60 -> N61[label="",style=dashed];
-	N61 -> N9[label="",style=dashed];
-	N61 -> N18[label="",style=dashed];
-	N61 -> N73[label="",style=dashed];
-	N61 -> N77[label="",style=dashed];
-	N61 -> N91[label="",style=dashed];
-	N62 -> N21[label="",style=dashed];
-	N62 -> N22[label="",style=dashed];
-	N62 -> N87[label="",style=dashed];
-	N62 -> N88[label="",style=dashed];
-	N62 -> N89[label="",style=dashed];
-	N63 -> N20[label="",style=dashed];
-	N63 -> N28[label="",style=dashed];
-	N63 -> N45[label="",style=dashed];
-	N63 -> N47[label="",style=dashed];
-	N63 -> N64[label="",style=dashed];
-	N64 -> N67[label="",style=dashed];
-	N65 -> N18[label="",style=dashed];
-	N65 -> N54[label="",style=dashed];
-	N65 -> N66[label="",style=dashed];
-	N66 -> N47[label="",style=dashed];
-	N67 -> N20[label="",style=dashed];
-	N67 -> N47[label="",style=dashed];
-	N67 -> N59[label="",style=dashed];
-	N67 -> N66[label="",style=dashed];
-	N68 -> N26[label="",style=dashed];
-	N68 -> N69[label="",style=dashed];
-	N73 -> N9[label="",style=dashed];
-	N73 -> N26[label="",style=dashed];
-	N73 -> N47[label="",style=dashed];
-	N73 -> N68[label="",style=dashed];
-	N73 -> N71[label="",style=dashed];
-	N73 -> N74[label="",style=dashed];
-	N73 -> N75[label="",style=dashed];
-	N73 -> N76[label="",style=dashed];
-	N73 -> N77[label="",style=dashed];
-	N74 -> N26[label="",style=dashed];
-	N74 -> N68[label="",style=dashed];
+	N36 -> N27[label="",style=dashed];
+	N36 -> N48[label="",style=dashed];
+	N36 -> N69[label="",style=dashed];
+	N38 -> N34[label="",style=dashed];
+	N38 -> N39[label="",style=dashed];
+	N38 -> N40[label="",style=dashed];
+	N39 -> N21[label="",style=dashed];
+	N39 -> N36[label="",style=dashed];
+	N39 -> N46[label="",style=dashed];
+	N39 -> N48[label="",style=dashed];
+	N39 -> N65[label="",style=dashed];
+	N45 -> N69[label="",style=dashed];
+	N47 -> N34[label="",style=dashed];
+	N47 -> N43[label="",style=dashed];
+	N50 -> N27[label="",style=dashed];
+	N50 -> N48[label="",style=dashed];
+	N50 -> N69[label="",style=dashed];
+	N56 -> N43[label="",style=dashed];
+	N56 -> N46[label="",style=dashed];
+	N58 -> N85[label="",style=dashed];
+	N58 -> N86[label="",style=dashed];
+	N59 -> N48[label="",style=dashed];
+	N59 -> N91[label="",style=dashed];
+	N60 -> N21[label="",style=dashed];
+	N61 -> N19[label="",style=dashed];
+	N61 -> N21[label="",style=dashed];
+	N61 -> N43[label="",style=dashed];
+	N61 -> N62[label="",style=dashed];
+	N62 -> N9[label="",style=dashed];
+	N62 -> N19[label="",style=dashed];
+	N62 -> N74[label="",style=dashed];
+	N62 -> N78[label="",style=dashed];
+	N62 -> N95[label="",style=dashed];
+	N63 -> N22[label="",style=dashed];
+	N63 -> N23[label="",style=dashed];
+	N63 -> N88[label="",style=dashed];
+	N63 -> N89[label="",style=dashed];
+	N63 -> N90[label="",style=dashed];
+	N64 -> N21[label="",style=dashed];
+	N64 -> N29[label="",style=dashed];
+	N64 -> N46[label="",style=dashed];
+	N64 -> N48[label="",style=dashed];
+	N64 -> N65[label="",style=dashed];
+	N65 -> N68[label="",style=dashed];
+	N66 -> N19[label="",style=dashed];
+	N66 -> N55[label="",style=dashed];
+	N66 -> N67[label="",style=dashed];
+	N67 -> N48[label="",style=dashed];
+	N68 -> N21[label="",style=dashed];
+	N68 -> N48[label="",style=dashed];
+	N68 -> N60[label="",style=dashed];
+	N68 -> N67[label="",style=dashed];
+	N69 -> N27[label="",style=dashed];
+	N69 -> N70[label="",style=dashed];
+	N74 -> N9[label="",style=dashed];
+	N74 -> N27[label="",style=dashed];
+	N74 -> N48[label="",style=dashed];
+	N74 -> N69[label="",style=dashed];
+	N74 -> N72[label="",style=dashed];
 	N74 -> N75[label="",style=dashed];
+	N74 -> N76[label="",style=dashed];
+	N74 -> N77[label="",style=dashed];
 	N74 -> N78[label="",style=dashed];
-	N75 -> N26[label="",style=dashed];
-	N75 -> N43[label="",style=dashed];
-	N75 -> N47[label="",style=dashed];
-	N75 -> N68[label="",style=dashed];
-	N75 -> N78[label="",style=dashed];
-	N76 -> N40[label="",style=dashed];
-	N76 -> N43[label="",style=dashed];
-	N76 -> N47[label="",style=dashed];
-	N76 -> N80[label="",style=dashed];
-	N76 -> N81[label="",style=dashed];
-	N76 -> N82[label="",style=dashed];
-	N78 -> N26[label="",style=dashed];
-	N78 -> N69[label="",style=dashed];
-	N79 -> N42[label="",style=dashed];
-	N80 -> N81[label="",style=dashed];
-	N83 -> N17[label="",style=dashed];
-	N83 -> N18[label="",style=dashed];
-	N83 -> N60[label="",style=dashed];
-	N83 -> N61[label="",style=dashed];
-	N85 -> N20[label="",style=dashed];
-	N85 -> N26[label="",style=dashed];
-	N85 -> N47[label="",style=dashed];
-	N85 -> N68[label="",style=dashed];
-	N85 -> N86[label="",style=dashed];
-	N88 -> N92[label="",style=dashed];
-	N90 -> N47[label="",style=dashed];
-	N90 -> N64[label="",style=dashed];
-	N92 -> N47[label="",style=dashed];
-	N92 -> N68[label="",style=dashed];
+	N75 -> N27[label="",style=dashed];
+	N75 -> N69[label="",style=dashed];
+	N75 -> N76[label="",style=dashed];
+	N75 -> N79[label="",style=dashed];
+	N76 -> N27[label="",style=dashed];
+	N76 -> N44[label="",style=dashed];
+	N76 -> N48[label="",style=dashed];
+	N76 -> N69[label="",style=dashed];
+	N76 -> N79[label="",style=dashed];
+	N77 -> N41[label="",style=dashed];
+	N77 -> N44[label="",style=dashed];
+	N77 -> N48[label="",style=dashed];
+	N77 -> N81[label="",style=dashed];
+	N77 -> N82[label="",style=dashed];
+	N77 -> N83[label="",style=dashed];
+	N79 -> N27[label="",style=dashed];
+	N79 -> N70[label="",style=dashed];
+	N80 -> N43[label="",style=dashed];
+	N81 -> N82[label="",style=dashed];
+	N84 -> N18[label="",style=dashed];
+	N84 -> N19[label="",style=dashed];
+	N84 -> N61[label="",style=dashed];
+	N84 -> N62[label="",style=dashed];
+	N86 -> N21[label="",style=dashed];
+	N86 -> N27[label="",style=dashed];
+	N86 -> N48[label="",style=dashed];
+	N86 -> N69[label="",style=dashed];
+	N86 -> N87[label="",style=dashed];
+	N89 -> N96[label="",style=dashed];
+	N91 -> N48[label="",style=dashed];
+	N91 -> N65[label="",style=dashed];
+	N92 -> N55[label="",style=dashed];
+	N92 -> N93[label="",style=dashed];
+	N92 -> N94[label="",style=dashed];
+	N96 -> N48[label="",style=dashed];
+	N96 -> N69[label="",style=dashed];
 }
diff --git a/tools/graph.png b/tools/graph.png
index 7c61ff8e..22683f50 100644
Binary files a/tools/graph.png and b/tools/graph.png differ