diff --git a/python/eth_address_declarator/runnable/add.py b/python/eth_address_declarator/runnable/add.py
index 3ee6998..2978f2f 100644
--- a/python/eth_address_declarator/runnable/add.py
+++ b/python/eth_address_declarator/runnable/add.py
@@ -46,8 +46,9 @@ if args.vv:
 elif args.v:
     logg.setLevel(logging.INFO)
 
-block_last = args.w
+
 block_all = args.ww
+block_last = args.w or block_all
 
 w3 = web3.Web3(web3.Web3.HTTPProvider(args.p))
 
diff --git a/python/eth_token_index/runnable/add.py b/python/eth_token_index/runnable/add.py
index df21f12..888051b 100644
--- a/python/eth_token_index/runnable/add.py
+++ b/python/eth_token_index/runnable/add.py
@@ -46,8 +46,8 @@ if args.vv:
 elif args.v:
     logg.setLevel(logging.INFO)
 
-block_last = args.w
 block_all = args.ww
+block_last = args.w or block_all
 
 w3 = web3.Web3(web3.Web3.HTTPProvider(args.p))
 
@@ -96,6 +96,9 @@ def main():
                 ],
             )
 
+    if block_last:
+        helper.wait_for()
+
     print(tx_hash)
 
 
diff --git a/python/setup.cfg b/python/setup.cfg
index f2d3e97..e4e1d67 100644
--- a/python/setup.cfg
+++ b/python/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = eth-address-index
-version = 0.1.0a7
+version = 0.1.0a8
 description = Signed metadata declarations for ethereum addresses
 author = Louis Holbrook
 author_email = dev@holbrook.no