diff --git a/Cargo.lock b/Cargo.lock
index 58833dc..53aea71 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6,7 +6,7 @@ version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86"
 dependencies = [
- "memchr",
+    "memchr",
 ]
 
 [[package]]
@@ -15,7 +15,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
 dependencies = [
- "winapi",
+    "winapi",
 ]
 
 [[package]]
@@ -30,9 +30,9 @@ version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
 dependencies = [
- "hermit-abi",
- "libc",
- "winapi",
+    "hermit-abi",
+    "libc",
+    "winapi",
 ]
 
 [[package]]
@@ -59,10 +59,10 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
 dependencies = [
- "block-padding",
- "byte-tools",
- "byteorder",
- "generic-array",
+    "block-padding",
+    "byte-tools",
+    "byteorder",
+    "generic-array",
 ]
 
 [[package]]
@@ -71,7 +71,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
 dependencies = [
- "byte-tools",
+    "byte-tools",
 ]
 
 [[package]]
@@ -104,9 +104,9 @@ version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "942f72db697d8767c22d46a598e01f2d3b475501ea43d0db4f16d90259182d0b"
 dependencies = [
- "num-integer",
- "num-traits",
- "time",
+    "num-integer",
+    "num-traits",
+    "time",
 ]
 
 [[package]]
@@ -115,13 +115,13 @@ version = "2.33.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
 dependencies = [
- "ansi_term",
- "atty",
- "bitflags",
- "strsim",
- "textwrap",
- "unicode-width",
- "vec_map",
+    "ansi_term",
+    "atty",
+    "bitflags",
+    "strsim",
+    "textwrap",
+    "unicode-width",
+    "vec_map",
 ]
 
 [[package]]
@@ -130,13 +130,13 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee3bdf54005ba6e218706edda1659879b0bc2c28d01e8f15a45b33ff52c89848"
 dependencies = [
- "anyhow",
- "clap",
- "env_logger",
- "json5",
- "log",
- "serde",
- "serde_json",
+    "anyhow",
+    "clap",
+    "env_logger",
+    "json5",
+    "log",
+    "serde",
+    "serde_json",
 ]
 
 [[package]]
@@ -145,7 +145,7 @@ version = "0.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
 dependencies = [
- "bitflags",
+    "bitflags",
 ]
 
 [[package]]
@@ -154,7 +154,7 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4344512281c643ae7638bbabc3af17a11307803ec8f0fcad9fae512a8bf36467"
 dependencies = [
- "bitflags",
+    "bitflags",
 ]
 
 [[package]]
@@ -163,46 +163,46 @@ version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59"
 dependencies = [
- "atty",
- "lazy_static",
- "winapi",
+    "atty",
+    "lazy_static",
+    "winapi",
 ]
 
 [[package]]
 name = "crsn"
 version = "0.1.0"
 dependencies = [
- "anyhow",
- "dyn-clonable",
- "log",
- "num-traits",
- "sexp",
- "thiserror",
+    "anyhow",
+    "dyn-clonable",
+    "log",
+    "num-traits",
+    "sexp",
+    "thiserror",
 ]
 
 [[package]]
 name = "crsn_arith"
 version = "0.1.0"
 dependencies = [
- "crsn",
- "num-traits",
+    "crsn",
+    "num-traits",
 ]
 
 [[package]]
 name = "crsn_screen"
 version = "0.1.0"
 dependencies = [
- "crsn",
- "log",
- "minifb",
- "parking_lot",
+    "crsn",
+    "log",
+    "minifb",
+    "parking_lot",
 ]
 
 [[package]]
 name = "crsn_stacks"
 version = "0.1.0"
 dependencies = [
- "crsn",
+    "crsn",
 ]
 
 [[package]]
@@ -211,7 +211,7 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
 dependencies = [
- "generic-array",
+    "generic-array",
 ]
 
 [[package]]
@@ -226,8 +226,8 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4e9232f0e607a262ceb9bd5141a3dfb3e4db6994b31989bbfd845878cba59fd4"
 dependencies = [
- "dyn-clonable-impl",
- "dyn-clone",
+    "dyn-clonable-impl",
+    "dyn-clone",
 ]
 
 [[package]]
@@ -236,9 +236,9 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "558e40ea573c374cf53507fd240b7ee2f5477df7cfebdb97323ec61c719399c5"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+    "proc-macro2",
+    "quote",
+    "syn",
 ]
 
 [[package]]
@@ -253,11 +253,11 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
 dependencies = [
- "atty",
- "humantime",
- "log",
- "regex",
- "termcolor",
+    "atty",
+    "humantime",
+    "log",
+    "regex",
+    "termcolor",
 ]
 
 [[package]]
@@ -278,7 +278,7 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
 dependencies = [
- "typenum",
+    "typenum",
 ]
 
 [[package]]
@@ -287,9 +287,9 @@ version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
 dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
+    "cfg-if",
+    "libc",
+    "wasi 0.9.0+wasi-snapshot-preview1",
 ]
 
 [[package]]
@@ -298,7 +298,7 @@ version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c30f6d0bc6b00693347368a67d41b58f2fb851215ff1da49e90fe2c5c667151"
 dependencies = [
- "libc",
+    "libc",
 ]
 
 [[package]]
@@ -307,7 +307,7 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
 dependencies = [
- "quick-error",
+    "quick-error",
 ]
 
 [[package]]
@@ -316,7 +316,7 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "63312a18f7ea8760cdd0a7c5aac1a619752a246b833545e3e36d1f81f7cd9e66"
 dependencies = [
- "cfg-if",
+    "cfg-if",
 ]
 
 [[package]]
@@ -331,25 +331,25 @@ version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8eb2522ff59fbfefb955e9bd44d04d5e5c2d0e8865bfc2c3d1ab3916183ef5ee"
 dependencies = [
- "pest",
- "pest_derive",
- "serde",
+    "pest",
+    "pest_derive",
+    "serde",
 ]
 
 [[package]]
 name = "launcher"
 version = "0.1.0"
 dependencies = [
- "anyhow",
- "clappconfig",
- "crsn",
- "crsn_arith",
- "crsn_screen",
- "crsn_stacks",
- "log",
- "serde",
- "simple_logger",
- "thiserror",
+    "anyhow",
+    "clappconfig",
+    "crsn",
+    "crsn_arith",
+    "crsn_screen",
+    "crsn_stacks",
+    "log",
+    "serde",
+    "simple_logger",
+    "thiserror",
 ]
 
 [[package]]
@@ -370,7 +370,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28247cc5a5be2f05fbcd76dd0cf2c7d3b5400cb978a28042abcd4fa0b3f8261c"
 dependencies = [
- "scopeguard",
+    "scopeguard",
 ]
 
 [[package]]
@@ -379,7 +379,7 @@ version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
 dependencies = [
- "cfg-if",
+    "cfg-if",
 ]
 
 [[package]]
@@ -406,17 +406,17 @@ version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2eb411a297b8f714800f085846cbda55fbd2ae17ecd381f1b4652af0e5bebe63"
 dependencies = [
- "cc",
- "orbclient",
- "raw-window-handle",
- "tempfile",
- "wayland-client",
- "wayland-cursor",
- "wayland-protocols",
- "winapi",
- "x11-dl",
- "xkb",
- "xkbcommon-sys",
+    "cc",
+    "orbclient",
+    "raw-window-handle",
+    "tempfile",
+    "wayland-client",
+    "wayland-cursor",
+    "wayland-protocols",
+    "winapi",
+    "x11-dl",
+    "xkb",
+    "xkbcommon-sys",
 ]
 
 [[package]]
@@ -425,11 +425,11 @@ version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363"
 dependencies = [
- "bitflags",
- "cc",
- "cfg-if",
- "libc",
- "void",
+    "bitflags",
+    "cc",
+    "cfg-if",
+    "libc",
+    "void",
 ]
 
 [[package]]
@@ -438,8 +438,8 @@ version = "5.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
 dependencies = [
- "memchr",
- "version_check",
+    "memchr",
+    "version_check",
 ]
 
 [[package]]
@@ -448,9 +448,9 @@ version = "0.1.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e"
 dependencies = [
- "num-integer",
- "num-iter",
- "num-traits",
+    "num-integer",
+    "num-iter",
+    "num-traits",
 ]
 
 [[package]]
@@ -459,8 +459,8 @@ version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b"
 dependencies = [
- "autocfg 1.0.1",
- "num-traits",
+    "autocfg 1.0.1",
+    "num-traits",
 ]
 
 [[package]]
@@ -469,9 +469,9 @@ version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f"
 dependencies = [
- "autocfg 1.0.1",
- "num-integer",
- "num-traits",
+    "autocfg 1.0.1",
+    "num-integer",
+    "num-traits",
 ]
 
 [[package]]
@@ -480,7 +480,7 @@ version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611"
 dependencies = [
- "autocfg 1.0.1",
+    "autocfg 1.0.1",
 ]
 
 [[package]]
@@ -501,8 +501,8 @@ version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8b18f57ab94fbd058e30aa57f712ec423c0bb7403f8493a6c58eef0c36d9402"
 dependencies = [
- "redox_syscall",
- "sdl2",
+    "redox_syscall",
+    "sdl2",
 ]
 
 [[package]]
@@ -511,9 +511,9 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4893845fa2ca272e647da5d0e46660a314ead9c2fdd9a883aabc32e481a8733"
 dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core",
+    "instant",
+    "lock_api",
+    "parking_lot_core",
 ]
 
 [[package]]
@@ -522,13 +522,13 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b"
 dependencies = [
- "cfg-if",
- "cloudabi 0.1.0",
- "instant",
- "libc",
- "redox_syscall",
- "smallvec",
- "winapi",
+    "cfg-if",
+    "cloudabi 0.1.0",
+    "instant",
+    "libc",
+    "redox_syscall",
+    "smallvec",
+    "winapi",
 ]
 
 [[package]]
@@ -537,7 +537,7 @@ version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
 dependencies = [
- "ucd-trie",
+    "ucd-trie",
 ]
 
 [[package]]
@@ -546,8 +546,8 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0"
 dependencies = [
- "pest",
- "pest_generator",
+    "pest",
+    "pest_generator",
 ]
 
 [[package]]
@@ -556,11 +556,11 @@ version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55"
 dependencies = [
- "pest",
- "pest_meta",
- "proc-macro2",
- "quote",
- "syn",
+    "pest",
+    "pest_meta",
+    "proc-macro2",
+    "quote",
+    "syn",
 ]
 
 [[package]]
@@ -569,9 +569,9 @@ version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d"
 dependencies = [
- "maplit",
- "pest",
- "sha-1",
+    "maplit",
+    "pest",
+    "sha-1",
 ]
 
 [[package]]
@@ -592,7 +592,7 @@ version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "36e28516df94f3dd551a587da5357459d9b36d945a7c37c3557928c1c2ff2a2c"
 dependencies = [
- "unicode-xid",
+    "unicode-xid",
 ]
 
 [[package]]
@@ -607,7 +607,7 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
 dependencies = [
- "proc-macro2",
+    "proc-macro2",
 ]
 
 [[package]]
@@ -616,17 +616,17 @@ version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
 dependencies = [
- "autocfg 0.1.7",
- "libc",
- "rand_chacha 0.1.1",
- "rand_core 0.4.2",
- "rand_hc 0.1.0",
- "rand_isaac",
- "rand_jitter",
- "rand_os",
- "rand_pcg",
- "rand_xorshift",
- "winapi",
+    "autocfg 0.1.7",
+    "libc",
+    "rand_chacha 0.1.1",
+    "rand_core 0.4.2",
+    "rand_hc 0.1.0",
+    "rand_isaac",
+    "rand_jitter",
+    "rand_os",
+    "rand_pcg",
+    "rand_xorshift",
+    "winapi",
 ]
 
 [[package]]
@@ -635,11 +635,11 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
 dependencies = [
- "getrandom",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc 0.2.0",
+    "getrandom",
+    "libc",
+    "rand_chacha 0.2.2",
+    "rand_core 0.5.1",
+    "rand_hc 0.2.0",
 ]
 
 [[package]]
@@ -648,8 +648,8 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
 dependencies = [
- "autocfg 0.1.7",
- "rand_core 0.3.1",
+    "autocfg 0.1.7",
+    "rand_core 0.3.1",
 ]
 
 [[package]]
@@ -658,8 +658,8 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
 dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
+    "ppv-lite86",
+    "rand_core 0.5.1",
 ]
 
 [[package]]
@@ -668,7 +668,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
 dependencies = [
- "rand_core 0.4.2",
+    "rand_core 0.4.2",
 ]
 
 [[package]]
@@ -683,7 +683,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
 dependencies = [
- "getrandom",
+    "getrandom",
 ]
 
 [[package]]
@@ -692,7 +692,7 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
 dependencies = [
- "rand_core 0.3.1",
+    "rand_core 0.3.1",
 ]
 
 [[package]]
@@ -701,7 +701,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
 dependencies = [
- "rand_core 0.5.1",
+    "rand_core 0.5.1",
 ]
 
 [[package]]
@@ -710,7 +710,7 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
 dependencies = [
- "rand_core 0.3.1",
+    "rand_core 0.3.1",
 ]
 
 [[package]]
@@ -719,9 +719,9 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
 dependencies = [
- "libc",
- "rand_core 0.4.2",
- "winapi",
+    "libc",
+    "rand_core 0.4.2",
+    "winapi",
 ]
 
 [[package]]
@@ -730,12 +730,12 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
 dependencies = [
- "cloudabi 0.0.3",
- "fuchsia-cprng",
- "libc",
- "rand_core 0.4.2",
- "rdrand",
- "winapi",
+    "cloudabi 0.0.3",
+    "fuchsia-cprng",
+    "libc",
+    "rand_core 0.4.2",
+    "rdrand",
+    "winapi",
 ]
 
 [[package]]
@@ -744,8 +744,8 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
 dependencies = [
- "autocfg 0.1.7",
- "rand_core 0.4.2",
+    "autocfg 0.1.7",
+    "rand_core 0.4.2",
 ]
 
 [[package]]
@@ -754,7 +754,7 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
 dependencies = [
- "rand_core 0.3.1",
+    "rand_core 0.3.1",
 ]
 
 [[package]]
@@ -763,7 +763,7 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a441a7a6c80ad6473bd4b74ec1c9a4c951794285bf941c2126f607c72e48211"
 dependencies = [
- "libc",
+    "libc",
 ]
 
 [[package]]
@@ -772,7 +772,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
 dependencies = [
- "rand_core 0.3.1",
+    "rand_core 0.3.1",
 ]
 
 [[package]]
@@ -787,10 +787,10 @@ version = "1.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
 dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
- "thread_local",
+    "aho-corasick",
+    "memchr",
+    "regex-syntax",
+    "thread_local",
 ]
 
 [[package]]
@@ -805,7 +805,7 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
 dependencies = [
- "winapi",
+    "winapi",
 ]
 
 [[package]]
@@ -826,12 +826,12 @@ version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d051a07231e303f5f719da78cb6f7394f6d5b54f733aef5b0b447804a83edd7b"
 dependencies = [
- "bitflags",
- "lazy_static",
- "libc",
- "num",
- "rand 0.6.5",
- "sdl2-sys",
+    "bitflags",
+    "lazy_static",
+    "libc",
+    "num",
+    "rand 0.6.5",
+    "sdl2-sys",
 ]
 
 [[package]]
@@ -840,8 +840,8 @@ version = "0.32.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34e71125077d297d57e4c1acfe8981b5bdfbf5a20e7b589abfdcb33bf1127f86"
 dependencies = [
- "cfg-if",
- "libc",
+    "cfg-if",
+    "libc",
 ]
 
 [[package]]
@@ -850,7 +850,7 @@ version = "1.0.116"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96fe57af81d28386a513cbc6858332abc6117cfdb5999647c6444b8f43a370a5"
 dependencies = [
- "serde_derive",
+    "serde_derive",
 ]
 
 [[package]]
@@ -859,9 +859,9 @@ version = "1.0.116"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f630a6370fd8e457873b4bd2ffdae75408bc291ba72be773772a4c2a065d9ae8"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+    "proc-macro2",
+    "quote",
+    "syn",
 ]
 
 [[package]]
@@ -870,9 +870,9 @@ version = "1.0.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c"
 dependencies = [
- "itoa",
- "ryu",
- "serde",
+    "itoa",
+    "ryu",
+    "serde",
 ]
 
 [[package]]
@@ -887,10 +887,10 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df"
 dependencies = [
- "block-buffer",
- "digest",
- "fake-simd",
- "opaque-debug",
+    "block-buffer",
+    "digest",
+    "fake-simd",
+    "opaque-debug",
 ]
 
 [[package]]
@@ -899,11 +899,11 @@ version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13a53ed2efd04911c8280f2da7bf9abd350c931b86bc7f9f2386fbafbf525ff9"
 dependencies = [
- "atty",
- "chrono",
- "colored",
- "log",
- "winapi",
+    "atty",
+    "chrono",
+    "colored",
+    "log",
+    "winapi",
 ]
 
 [[package]]
@@ -924,9 +924,9 @@ version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6690e3e9f692504b941dc6c3b188fd28df054f7fb8469ab40680df52fdcc842b"
 dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
+    "proc-macro2",
+    "quote",
+    "unicode-xid",
 ]
 
 [[package]]
@@ -935,12 +935,12 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
 dependencies = [
- "cfg-if",
- "libc",
- "rand 0.7.3",
- "redox_syscall",
- "remove_dir_all",
- "winapi",
+    "cfg-if",
+    "libc",
+    "rand 0.7.3",
+    "redox_syscall",
+    "remove_dir_all",
+    "winapi",
 ]
 
 [[package]]
@@ -949,7 +949,7 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
 dependencies = [
- "winapi-util",
+    "winapi-util",
 ]
 
 [[package]]
@@ -958,7 +958,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
 dependencies = [
- "unicode-width",
+    "unicode-width",
 ]
 
 [[package]]
@@ -967,7 +967,7 @@ version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08"
 dependencies = [
- "thiserror-impl",
+    "thiserror-impl",
 ]
 
 [[package]]
@@ -976,9 +976,9 @@ version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+    "proc-macro2",
+    "quote",
+    "syn",
 ]
 
 [[package]]
@@ -987,7 +987,7 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
 dependencies = [
- "lazy_static",
+    "lazy_static",
 ]
 
 [[package]]
@@ -996,9 +996,9 @@ version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
 dependencies = [
- "libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
- "winapi",
+    "libc",
+    "wasi 0.10.0+wasi-snapshot-preview1",
+    "winapi",
 ]
 
 [[package]]
@@ -1061,13 +1061,13 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab702fefbcd6d6f67fb5816e3a89a3b5a42a94290abbc015311c9a30d1068ae4"
 dependencies = [
- "bitflags",
- "downcast-rs",
- "libc",
- "nix",
- "wayland-commons",
- "wayland-scanner",
- "wayland-sys",
+    "bitflags",
+    "downcast-rs",
+    "libc",
+    "nix",
+    "wayland-commons",
+    "wayland-scanner",
+    "wayland-sys",
 ]
 
 [[package]]
@@ -1076,10 +1076,10 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e972e9336ad5a9dd861b4e21ff35ad71d3e5c6b4803d65c39913612f851b95f1"
 dependencies = [
- "nix",
- "once_cell",
- "smallvec",
- "wayland-sys",
+    "nix",
+    "once_cell",
+    "smallvec",
+    "wayland-sys",
 ]
 
 [[package]]
@@ -1088,9 +1088,9 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "539f346e1a3f706f38c8ccbe1196001e2fb1c9b3e6b605c27d665db2f5b60d41"
 dependencies = [
- "nix",
- "wayland-client",
- "xcursor",
+    "nix",
+    "wayland-client",
+    "xcursor",
 ]
 
 [[package]]
@@ -1099,10 +1099,10 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3d6fc54b17b98b5083bc21ae3a30e6d75cb4b01647360e4c3a04648bcf8781d"
 dependencies = [
- "bitflags",
- "wayland-client",
- "wayland-commons",
- "wayland-scanner",
+    "bitflags",
+    "wayland-client",
+    "wayland-commons",
+    "wayland-scanner",
 ]
 
 [[package]]
@@ -1111,9 +1111,9 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "030f56009d932bd9400bb472764fea8109be1b0fc482d9cd75496c943ac30328"
 dependencies = [
- "proc-macro2",
- "quote",
- "xml-rs",
+    "proc-macro2",
+    "quote",
+    "xml-rs",
 ]
 
 [[package]]
@@ -1122,7 +1122,7 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8bdeffbbb474477dfa2acb45ac7479e5fe8f741c64ab032c5d11b94d07edc269"
 dependencies = [
- "pkg-config",
+    "pkg-config",
 ]
 
 [[package]]
@@ -1131,8 +1131,8 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
 dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
+    "winapi-i686-pc-windows-gnu",
+    "winapi-x86_64-pc-windows-gnu",
 ]
 
 [[package]]
@@ -1147,7 +1147,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
 dependencies = [
- "winapi",
+    "winapi",
 ]
 
 [[package]]
@@ -1162,10 +1162,10 @@ version = "2.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2bf981e3a5b3301209754218f962052d4d9ee97e478f4d26d4a6eced34c1fef8"
 dependencies = [
- "lazy_static",
- "libc",
- "maybe-uninit",
- "pkg-config",
+    "lazy_static",
+    "libc",
+    "maybe-uninit",
+    "pkg-config",
 ]
 
 [[package]]
@@ -1174,7 +1174,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3a481cfdefd35e1c50073ae33a8000d695c98039544659f5dc5dd71311b0d01"
 dependencies = [
- "nom",
+    "nom",
 ]
 
 [[package]]
@@ -1183,9 +1183,9 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aec02bc5de902aa579f3d2f2c522edaf40fa42963cbaffe645b058ddcc68fdb2"
 dependencies = [
- "bitflags",
- "libc",
- "xkbcommon-sys",
+    "bitflags",
+    "libc",
+    "xkbcommon-sys",
 ]
 
 [[package]]
@@ -1194,8 +1194,8 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa434980dca02ebf28795d71e570dbb78316d095a228707efd6117bf8246d78b"
 dependencies = [
- "libc",
- "pkg-config",
+    "libc",
+    "pkg-config",
 ]
 
 [[package]]
diff --git a/crsn/src/asm/parse/mod.rs b/crsn/src/asm/parse/mod.rs
index 0e471e1..e8484c5 100644
--- a/crsn/src/asm/parse/mod.rs
+++ b/crsn/src/asm/parse/mod.rs
@@ -1,9 +1,9 @@
-use std::sync::atomic::{AtomicU32, AtomicU64};
+use std::sync::atomic::AtomicU32;
 
 pub use parse_instr::parse_instructions;
 
 use crate::asm::error::CrsnError;
-use crate::asm::instr::{Flatten, Op, Routine};
+use crate::asm::instr::Op;
 use crate::asm::parse::sexp_expect::expect_list;
 use crate::module::CrsnExtension;
 
diff --git a/crsn/src/asm/parse/parse_cond.rs b/crsn/src/asm/parse/parse_cond.rs
index 5089c45..fee3789 100644
--- a/crsn/src/asm/parse/parse_cond.rs
+++ b/crsn/src/asm/parse/parse_cond.rs
@@ -1,7 +1,7 @@
 use sexp::Sexp;
 
 use crate::asm::error::CrsnError;
-use crate::asm::instr::{Cond, cond, Instr, Flatten};
+use crate::asm::instr::{Cond, cond, Flatten};
 use crate::asm::parse::parse_instr::parse_instructions;
 use crate::asm::parse::sexp_expect::{expect_list, expect_string_atom};
 use crate::asm::patches::TryRemove;
diff --git a/crsn/src/asm/parse/parse_instr.rs b/crsn/src/asm/parse/parse_instr.rs
index 8e9e184..98c58af 100644
--- a/crsn/src/asm/parse/parse_instr.rs
+++ b/crsn/src/asm/parse/parse_instr.rs
@@ -1,7 +1,8 @@
 use sexp::Sexp;
 
+use crate::asm::data::literal::RoutineName;
 use crate::asm::error::CrsnError;
-use crate::asm::instr::{Instr, Flatten, Routine};
+use crate::asm::instr::{Flatten, Instr, Routine};
 use crate::asm::parse::arg_parser::TokenParser;
 use crate::asm::parse::parse_cond::parse_cond_branch;
 use crate::asm::parse::sexp_expect::{expect_list, expect_string_atom};
@@ -9,7 +10,6 @@ use crate::asm::patches::SexpIsA;
 use crate::module::{CrsnExtension, ParseRes};
 
 use super::parse_op::parse_op;
-use crate::asm::data::literal::RoutineName;
 
 pub fn parse_instructions(items: impl Iterator<Item=Sexp>, parsers: &[Box<dyn CrsnExtension>]) -> Result<Box<dyn Flatten>, CrsnError> {
     let mut parsed = vec![];
@@ -68,10 +68,10 @@ pub fn parse_instructions(items: impl Iterator<Item=Sexp>, parsers: &[Box<dyn Cr
     Ok(Box::new(parsed))
 }
 
-fn parse_routine(mut toki : impl Iterator<Item=Sexp> + Clone, parsers: &[Box<dyn CrsnExtension>]) ->  Result<Box<dyn Flatten>, CrsnError> {
+fn parse_routine(mut toki: impl Iterator<Item=Sexp> + Clone, parsers: &[Box<dyn CrsnExtension>]) -> Result<Box<dyn Flatten>, CrsnError> {
     let name = expect_string_atom(toki.next())?;
 
-    let arg_tokens = TokenParser::new(toki.clone().take_while(|e| e.is_atom()).collect());
+    let _arg_tokens = TokenParser::new(toki.clone().take_while(|e| e.is_atom()).collect());
 
     // TODO parse arg tokens
 
@@ -79,6 +79,6 @@ fn parse_routine(mut toki : impl Iterator<Item=Sexp> + Clone, parsers: &[Box<dyn
 
     return Ok(Box::new(Routine {
         name: RoutineName(name),
-        body
-    }))
+        body,
+    }));
 }
diff --git a/crsn/src/module/mod.rs b/crsn/src/module/mod.rs
index 473c1b8..0bed824 100644
--- a/crsn/src/module/mod.rs
+++ b/crsn/src/module/mod.rs
@@ -7,7 +7,7 @@ pub use eval_res::EvalRes;
 use crate::asm::data::literal::Value;
 use crate::asm::data::Mask;
 use crate::asm::error::CrsnError;
-use crate::asm::instr::{Op, Flatten};
+use crate::asm::instr::{Flatten, Op};
 use crate::asm::parse::arg_parser::TokenParser;
 use crate::runtime::fault::Fault;
 use crate::runtime::run_thread::state::RunState;
@@ -47,14 +47,14 @@ pub trait CrsnExtension: Debug + Send + Sync + 'static {
 
     /// Parse a generic S-expression (non-op)
     fn parse_syntax(&self, keyword: &str, tokens: TokenParser, parsers: &[Box<dyn CrsnExtension>])
-        -> Result<ParseRes<Box<dyn Flatten>>, CrsnError>
+                    -> Result<ParseRes<Box<dyn Flatten>>, CrsnError>
     {
         Ok(ParseRes::Unknown(tokens))
     }
 
     /// Drop an object referenced by a handle
     fn drop_obj(&self, ti: &ThreadInfo, state: &mut RunState, handle: Value)
-        -> Result<Option<()>, Fault>
+                -> Result<Option<()>, Fault>
     {
         // Default impl - we do not support dropping this object
         Ok(None)
@@ -62,7 +62,7 @@ pub trait CrsnExtension: Debug + Send + Sync + 'static {
 
     /// Run-time method called to read an object (using the object handle syntax)
     fn read_obj(&self, ti: &ThreadInfo, state: &mut RunState, handle: Value, _mask: Mask)
-        -> Result<Option<Value>, Fault>
+                -> Result<Option<Value>, Fault>
     {
         // Default impl - we do not support reading this object
         Ok(None)
@@ -70,7 +70,7 @@ pub trait CrsnExtension: Debug + Send + Sync + 'static {
 
     /// Run-time method called to write an object (using the object handle syntax)
     fn write_obj(&self, ti: &ThreadInfo, state: &mut RunState, handle: Value, mask: Mask)
-        -> Result<Option<()>, Fault>
+                 -> Result<Option<()>, Fault>
     {
         // Default impl - we do not support writing this object
         Ok(None)