diff --git a/Cargo.lock b/Cargo.lock
index 515dcd3..d860f70 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -163,7 +163,7 @@ dependencies = [
 
 [[package]]
 name = "client"
-version = "1.5.0"
+version = "1.5.1"
 dependencies = [
  "anyhow",
  "colored",
@@ -973,7 +973,7 @@ dependencies = [
 
 [[package]]
 name = "server"
-version = "1.5.0"
+version = "1.5.1"
 dependencies = [
  "anyhow",
  "bytes",
@@ -1006,7 +1006,7 @@ dependencies = [
 
 [[package]]
 name = "shared"
-version = "1.5.0"
+version = "1.5.1"
 dependencies = [
  "anyhow",
  "atty",
@@ -1389,7 +1389,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "wireguard-control"
-version = "1.5.0"
+version = "1.5.1"
 dependencies = [
  "base64",
  "curve25519-dalek",
@@ -1401,7 +1401,7 @@ dependencies = [
 
 [[package]]
 name = "wireguard-control-sys"
-version = "1.5.0"
+version = "1.5.1"
 dependencies = [
  "bindgen",
  "cc",
diff --git a/README.md b/README.md
index c436d51..cd1ac7e 100644
--- a/README.md
+++ b/README.md
@@ -214,10 +214,10 @@ brew install tonarino/innernet/innernet
 
 ```sh
 # to install innernet:
-cargo install --git https://github.com/tonarino/innernet --tag v1.5.0 client
+cargo install --git https://github.com/tonarino/innernet --tag v1.5.1 client
 
 # to install innernet-server:
-cargo install --git https://github.com/tonarino/innernet --tag v1.5.0 server
+cargo install --git https://github.com/tonarino/innernet --tag v1.5.1 server
 ```
 
 Note that you'll be responsible for updating manually.
diff --git a/client/Cargo.toml b/client/Cargo.toml
index f58380f..e572805 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -7,7 +7,7 @@ license = "MIT"
 name = "client"
 publish = false
 repository = "https://github.com/tonarino/innernet"
-version = "1.5.0"
+version = "1.5.1"
 
 [[bin]]
 name = "innernet"
diff --git a/doc/innernet-server.8 b/doc/innernet-server.8
index e47ff6f..c1ba262 100644
--- a/doc/innernet-server.8
+++ b/doc/innernet-server.8
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.5.
-.TH INNERNET-SERVER "8" "September 2021" "innernet-server 1.5.0" "System Administration Utilities"
+.TH INNERNET-SERVER "8" "November 2021" "innernet-server 1.5.1" "System Administration Utilities"
 .SH NAME
-innernet-server \- manual page for innernet-server 1.5.0
+innernet-server \- manual page for innernet-server 1.5.1
 .SH DESCRIPTION
-innernet\-server 1.5.0
+innernet\-server 1.5.1
 A server to coordinate innernet networks.
 .SS "USAGE:"
 .IP
diff --git a/doc/innernet-server.8.gz b/doc/innernet-server.8.gz
index 7088cad..8a9c152 100644
Binary files a/doc/innernet-server.8.gz and b/doc/innernet-server.8.gz differ
diff --git a/doc/innernet-server.completions.bash b/doc/innernet-server.completions.bash
index 8094976..205f78c 100644
--- a/doc/innernet-server.completions.bash
+++ b/doc/innernet-server.completions.bash
@@ -50,7 +50,7 @@ _innernet-server() {
 
     case "${cmd}" in
         innernet-server)
-            opts=" -h -V  --no-routing --help --version --backend --mtu   new uninstall serve add-peer rename-peer add-cidr delete-cidr completions help  init init"
+            opts=" -h -V  --no-routing --help --version --backend --mtu   new uninstall serve add-peer rename-peer add-cidr delete-cidr completions help  init"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0
diff --git a/doc/innernet-server.completions.elvish b/doc/innernet-server.completions.elvish
index 10b14ae..cdbfbff 100644
--- a/doc/innernet-server.completions.elvish
+++ b/doc/innernet-server.completions.elvish
@@ -64,7 +64,7 @@ edit:completion:arg-completer[innernet-server] = [@words]{
             cand --cidr 'Name of CIDR to add new peer under'
             cand --admin 'Make new peer an admin?'
             cand --save-config 'Save the config to the given location'
-            cand --invite-expires 'Invite expiration period (eg. "30d", "7w", "2h", "60m", "1000s")'
+            cand --invite-expires 'Invite expiration period (eg. ''30d'', ''7w'', ''2h'', ''60m'', ''1000s'')'
             cand --auto-ip 'Auto-assign the peer the first available IP within the CIDR'
             cand --yes 'Bypass confirmation'
             cand -h 'Prints help information'
@@ -82,8 +82,8 @@ edit:completion:arg-completer[innernet-server] = [@words]{
             cand --version 'Prints version information'
         }
         &'innernet-server;add-cidr'= {
-            cand --name 'The CIDR name (eg. "engineers")'
-            cand --cidr 'The CIDR network (eg. "10.42.5.0/24")'
+            cand --name 'The CIDR name (eg. ''engineers'')'
+            cand --cidr 'The CIDR network (eg. ''10.42.5.0/24'')'
             cand --parent 'The CIDR parent name'
             cand --yes 'Bypass confirmation'
             cand -h 'Prints help information'
@@ -92,7 +92,7 @@ edit:completion:arg-completer[innernet-server] = [@words]{
             cand --version 'Prints version information'
         }
         &'innernet-server;delete-cidr'= {
-            cand --name 'The CIDR name (eg. "engineers")'
+            cand --name 'The CIDR name (eg. ''engineers'')'
             cand --yes 'Bypass confirmation'
             cand -h 'Prints help information'
             cand --help 'Prints help information'
diff --git a/doc/innernet-server.completions.fish b/doc/innernet-server.completions.fish
index a5df07a..2335d79 100644
--- a/doc/innernet-server.completions.fish
+++ b/doc/innernet-server.completions.fish
@@ -31,7 +31,7 @@ complete -c innernet-server -n "__fish_seen_subcommand_from add-peer" -l ip -d '
 complete -c innernet-server -n "__fish_seen_subcommand_from add-peer" -l cidr -d 'Name of CIDR to add new peer under'
 complete -c innernet-server -n "__fish_seen_subcommand_from add-peer" -l admin -d 'Make new peer an admin?'
 complete -c innernet-server -n "__fish_seen_subcommand_from add-peer" -l save-config -d 'Save the config to the given location'
-complete -c innernet-server -n "__fish_seen_subcommand_from add-peer" -l invite-expires -d 'Invite expiration period (eg. "30d", "7w", "2h", "60m", "1000s")'
+complete -c innernet-server -n "__fish_seen_subcommand_from add-peer" -l invite-expires -d 'Invite expiration period (eg. \'30d\', \'7w\', \'2h\', \'60m\', \'1000s\')'
 complete -c innernet-server -n "__fish_seen_subcommand_from add-peer" -l auto-ip -d 'Auto-assign the peer the first available IP within the CIDR'
 complete -c innernet-server -n "__fish_seen_subcommand_from add-peer" -l yes -d 'Bypass confirmation'
 complete -c innernet-server -n "__fish_seen_subcommand_from add-peer" -s h -l help -d 'Prints help information'
@@ -41,13 +41,13 @@ complete -c innernet-server -n "__fish_seen_subcommand_from rename-peer" -l new-
 complete -c innernet-server -n "__fish_seen_subcommand_from rename-peer" -l yes -d 'Bypass confirmation'
 complete -c innernet-server -n "__fish_seen_subcommand_from rename-peer" -s h -l help -d 'Prints help information'
 complete -c innernet-server -n "__fish_seen_subcommand_from rename-peer" -s V -l version -d 'Prints version information'
-complete -c innernet-server -n "__fish_seen_subcommand_from add-cidr" -l name -d 'The CIDR name (eg. "engineers")'
-complete -c innernet-server -n "__fish_seen_subcommand_from add-cidr" -l cidr -d 'The CIDR network (eg. "10.42.5.0/24")'
+complete -c innernet-server -n "__fish_seen_subcommand_from add-cidr" -l name -d 'The CIDR name (eg. \'engineers\')'
+complete -c innernet-server -n "__fish_seen_subcommand_from add-cidr" -l cidr -d 'The CIDR network (eg. \'10.42.5.0/24\')'
 complete -c innernet-server -n "__fish_seen_subcommand_from add-cidr" -l parent -d 'The CIDR parent name'
 complete -c innernet-server -n "__fish_seen_subcommand_from add-cidr" -l yes -d 'Bypass confirmation'
 complete -c innernet-server -n "__fish_seen_subcommand_from add-cidr" -s h -l help -d 'Prints help information'
 complete -c innernet-server -n "__fish_seen_subcommand_from add-cidr" -s V -l version -d 'Prints version information'
-complete -c innernet-server -n "__fish_seen_subcommand_from delete-cidr" -l name -d 'The CIDR name (eg. "engineers")'
+complete -c innernet-server -n "__fish_seen_subcommand_from delete-cidr" -l name -d 'The CIDR name (eg. \'engineers\')'
 complete -c innernet-server -n "__fish_seen_subcommand_from delete-cidr" -l yes -d 'Bypass confirmation'
 complete -c innernet-server -n "__fish_seen_subcommand_from delete-cidr" -s h -l help -d 'Prints help information'
 complete -c innernet-server -n "__fish_seen_subcommand_from delete-cidr" -s V -l version -d 'Prints version information'
diff --git a/doc/innernet-server.completions.powershell b/doc/innernet-server.completions.powershell
index 3e6a0d7..22744f0 100644
--- a/doc/innernet-server.completions.powershell
+++ b/doc/innernet-server.completions.powershell
@@ -73,7 +73,7 @@ Register-ArgumentCompleter -Native -CommandName 'innernet-server' -ScriptBlock {
             [CompletionResult]::new('--cidr', 'cidr', [CompletionResultType]::ParameterName, 'Name of CIDR to add new peer under')
             [CompletionResult]::new('--admin', 'admin', [CompletionResultType]::ParameterName, 'Make new peer an admin?')
             [CompletionResult]::new('--save-config', 'save-config', [CompletionResultType]::ParameterName, 'Save the config to the given location')
-            [CompletionResult]::new('--invite-expires', 'invite-expires', [CompletionResultType]::ParameterName, 'Invite expiration period (eg. "30d", "7w", "2h", "60m", "1000s")')
+            [CompletionResult]::new('--invite-expires', 'invite-expires', [CompletionResultType]::ParameterName, 'Invite expiration period (eg. ''30d'', ''7w'', ''2h'', ''60m'', ''1000s'')')
             [CompletionResult]::new('--auto-ip', 'auto-ip', [CompletionResultType]::ParameterName, 'Auto-assign the peer the first available IP within the CIDR')
             [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Bypass confirmation')
             [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information')
@@ -93,8 +93,8 @@ Register-ArgumentCompleter -Native -CommandName 'innernet-server' -ScriptBlock {
             break
         }
         'innernet-server;add-cidr' {
-            [CompletionResult]::new('--name', 'name', [CompletionResultType]::ParameterName, 'The CIDR name (eg. "engineers")')
-            [CompletionResult]::new('--cidr', 'cidr', [CompletionResultType]::ParameterName, 'The CIDR network (eg. "10.42.5.0/24")')
+            [CompletionResult]::new('--name', 'name', [CompletionResultType]::ParameterName, 'The CIDR name (eg. ''engineers'')')
+            [CompletionResult]::new('--cidr', 'cidr', [CompletionResultType]::ParameterName, 'The CIDR network (eg. ''10.42.5.0/24'')')
             [CompletionResult]::new('--parent', 'parent', [CompletionResultType]::ParameterName, 'The CIDR parent name')
             [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Bypass confirmation')
             [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information')
@@ -104,7 +104,7 @@ Register-ArgumentCompleter -Native -CommandName 'innernet-server' -ScriptBlock {
             break
         }
         'innernet-server;delete-cidr' {
-            [CompletionResult]::new('--name', 'name', [CompletionResultType]::ParameterName, 'The CIDR name (eg. "engineers")')
+            [CompletionResult]::new('--name', 'name', [CompletionResultType]::ParameterName, 'The CIDR name (eg. ''engineers'')')
             [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Bypass confirmation')
             [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information')
             [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Prints help information')
diff --git a/doc/innernet-server.completions.zsh b/doc/innernet-server.completions.zsh
index 43bda27..d3f417e 100644
--- a/doc/innernet-server.completions.zsh
+++ b/doc/innernet-server.completions.zsh
@@ -44,19 +44,6 @@ _arguments "${_arguments_options[@]}" \
 '--version[Prints version information]' \
 && ret=0
 ;;
-(init)
-_arguments "${_arguments_options[@]}" \
-'--network-name=[The network name (ex: evilcorp)]' \
-'--network-cidr=[The network CIDR (ex: 10.42.0.0/16)]' \
-'(--auto-external-endpoint)--external-endpoint=[This server'\''s external endpoint (ex: 100.100.100.100:51820)]' \
-'--listen-port=[Port to listen on (for the WireGuard interface)]' \
-'--auto-external-endpoint[Auto-resolve external endpoint]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
 (new)
 _arguments "${_arguments_options[@]}" \
 '--network-name=[The network name (ex: evilcorp)]' \
@@ -98,7 +85,7 @@ _arguments "${_arguments_options[@]}" \
 '--cidr=[Name of CIDR to add new peer under]' \
 '--admin=[Make new peer an admin?]' \
 '--save-config=[Save the config to the given location]' \
-'--invite-expires=[Invite expiration period (eg. "30d", "7w", "2h", "60m", "1000s")]' \
+'--invite-expires=[Invite expiration period (eg. '\''30d'\'', '\''7w'\'', '\''2h'\'', '\''60m'\'', '\''1000s'\'')]' \
 '--auto-ip[Auto-assign the peer the first available IP within the CIDR]' \
 '--yes[Bypass confirmation]' \
 '-h[Prints help information]' \
@@ -122,8 +109,8 @@ _arguments "${_arguments_options[@]}" \
 ;;
 (add-cidr)
 _arguments "${_arguments_options[@]}" \
-'--name=[The CIDR name (eg. "engineers")]' \
-'--cidr=[The CIDR network (eg. "10.42.5.0/24")]' \
+'--name=[The CIDR name (eg. '\''engineers'\'')]' \
+'--cidr=[The CIDR network (eg. '\''10.42.5.0/24'\'')]' \
 '--parent=[The CIDR parent name]' \
 '--yes[Bypass confirmation]' \
 '-h[Prints help information]' \
@@ -135,7 +122,7 @@ _arguments "${_arguments_options[@]}" \
 ;;
 (delete-cidr)
 _arguments "${_arguments_options[@]}" \
-'--name=[The CIDR name (eg. "engineers")]' \
+'--name=[The CIDR name (eg. '\''engineers'\'')]' \
 '--yes[Bypass confirmation]' \
 '-h[Prints help information]' \
 '--help[Prints help information]' \
diff --git a/doc/innernet.8 b/doc/innernet.8
index 31ef90a..e7d0b07 100644
--- a/doc/innernet.8
+++ b/doc/innernet.8
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.5.
-.TH INNERNET "8" "September 2021" "innernet 1.5.0" "System Administration Utilities"
+.TH INNERNET "8" "November 2021" "innernet 1.5.1" "System Administration Utilities"
 .SH NAME
-innernet \- manual page for innernet 1.5.0
+innernet \- manual page for innernet 1.5.1
 .SH DESCRIPTION
-innernet 1.5.0
+innernet 1.5.1
 A client to manage innernet network interfaces.
 .SS "USAGE:"
 .IP
@@ -52,7 +52,7 @@ uninstall
 Uninstall an innernet network
 .TP
 down
-Bring down the interface (equivalent to "wg\-quick down <interface>")
+Bring down the interface (equivalent to 'wg\-quick down <interface>')
 .TP
 add\-peer
 Add a new peer
diff --git a/doc/innernet.8.gz b/doc/innernet.8.gz
index 61739ec..68af196 100644
Binary files a/doc/innernet.8.gz and b/doc/innernet.8.gz differ
diff --git a/doc/innernet.completions.bash b/doc/innernet.completions.bash
index 5034484..dae137f 100644
--- a/doc/innernet.completions.bash
+++ b/doc/innernet.completions.bash
@@ -86,7 +86,7 @@ _innernet() {
 
     case "${cmd}" in
         innernet)
-            opts=" -v -h -V  --verbose --no-routing --help --version --backend --mtu   install show up fetch uninstall down add-peer rename-peer add-cidr delete-cidr list-cidrs disable-peer enable-peer add-association delete-association list-associations set-listen-port override-endpoint completions help  redeem redeem  list list"
+            opts=" -v -h -V  --verbose --no-routing --help --version --backend --mtu   install show up fetch uninstall down add-peer rename-peer add-cidr delete-cidr list-cidrs disable-peer enable-peer add-association delete-association list-associations set-listen-port override-endpoint completions help  redeem  list"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0
diff --git a/doc/innernet.completions.elvish b/doc/innernet.completions.elvish
index 7486d1a..e987e20 100644
--- a/doc/innernet.completions.elvish
+++ b/doc/innernet.completions.elvish
@@ -29,7 +29,7 @@ edit:completion:arg-completer[innernet] = [@words]{
             cand up 'Bring up your local interface, and update it with latest peer list'
             cand fetch 'Fetch and update your local interface with the latest peer list'
             cand uninstall 'Uninstall an innernet network'
-            cand down 'Bring down the interface (equivalent to "wg-quick down <interface>")'
+            cand down 'Bring down the interface (equivalent to ''wg-quick down <interface>'')'
             cand add-peer 'Add a new peer'
             cand rename-peer 'Rename a peer'
             cand add-cidr 'Add a new CIDR'
@@ -104,7 +104,7 @@ edit:completion:arg-completer[innernet] = [@words]{
             cand --cidr 'Name of CIDR to add new peer under'
             cand --admin 'Make new peer an admin?'
             cand --save-config 'Save the config to the given location'
-            cand --invite-expires 'Invite expiration period (eg. "30d", "7w", "2h", "60m", "1000s")'
+            cand --invite-expires 'Invite expiration period (eg. ''30d'', ''7w'', ''2h'', ''60m'', ''1000s'')'
             cand --auto-ip 'Auto-assign the peer the first available IP within the CIDR'
             cand --yes 'Bypass confirmation'
             cand -h 'Prints help information'
@@ -122,8 +122,8 @@ edit:completion:arg-completer[innernet] = [@words]{
             cand --version 'Prints version information'
         }
         &'innernet;add-cidr'= {
-            cand --name 'The CIDR name (eg. "engineers")'
-            cand --cidr 'The CIDR network (eg. "10.42.5.0/24")'
+            cand --name 'The CIDR name (eg. ''engineers'')'
+            cand --cidr 'The CIDR network (eg. ''10.42.5.0/24'')'
             cand --parent 'The CIDR parent name'
             cand --yes 'Bypass confirmation'
             cand -h 'Prints help information'
@@ -132,7 +132,7 @@ edit:completion:arg-completer[innernet] = [@words]{
             cand --version 'Prints version information'
         }
         &'innernet;delete-cidr'= {
-            cand --name 'The CIDR name (eg. "engineers")'
+            cand --name 'The CIDR name (eg. ''engineers'')'
             cand --yes 'Bypass confirmation'
             cand -h 'Prints help information'
             cand --help 'Prints help information'
diff --git a/doc/innernet.completions.fish b/doc/innernet.completions.fish
index 8d22b99..3685870 100644
--- a/doc/innernet.completions.fish
+++ b/doc/innernet.completions.fish
@@ -9,7 +9,7 @@ complete -c innernet -n "__fish_use_subcommand" -f -a "show" -d 'Enumerate all i
 complete -c innernet -n "__fish_use_subcommand" -f -a "up" -d 'Bring up your local interface, and update it with latest peer list'
 complete -c innernet -n "__fish_use_subcommand" -f -a "fetch" -d 'Fetch and update your local interface with the latest peer list'
 complete -c innernet -n "__fish_use_subcommand" -f -a "uninstall" -d 'Uninstall an innernet network'
-complete -c innernet -n "__fish_use_subcommand" -f -a "down" -d 'Bring down the interface (equivalent to "wg-quick down <interface>")'
+complete -c innernet -n "__fish_use_subcommand" -f -a "down" -d 'Bring down the interface (equivalent to \'wg-quick down <interface>\')'
 complete -c innernet -n "__fish_use_subcommand" -f -a "add-peer" -d 'Add a new peer'
 complete -c innernet -n "__fish_use_subcommand" -f -a "rename-peer" -d 'Rename a peer'
 complete -c innernet -n "__fish_use_subcommand" -f -a "add-cidr" -d 'Add a new CIDR'
@@ -54,7 +54,7 @@ complete -c innernet -n "__fish_seen_subcommand_from add-peer" -l ip -d 'Specify
 complete -c innernet -n "__fish_seen_subcommand_from add-peer" -l cidr -d 'Name of CIDR to add new peer under'
 complete -c innernet -n "__fish_seen_subcommand_from add-peer" -l admin -d 'Make new peer an admin?'
 complete -c innernet -n "__fish_seen_subcommand_from add-peer" -l save-config -d 'Save the config to the given location'
-complete -c innernet -n "__fish_seen_subcommand_from add-peer" -l invite-expires -d 'Invite expiration period (eg. "30d", "7w", "2h", "60m", "1000s")'
+complete -c innernet -n "__fish_seen_subcommand_from add-peer" -l invite-expires -d 'Invite expiration period (eg. \'30d\', \'7w\', \'2h\', \'60m\', \'1000s\')'
 complete -c innernet -n "__fish_seen_subcommand_from add-peer" -l auto-ip -d 'Auto-assign the peer the first available IP within the CIDR'
 complete -c innernet -n "__fish_seen_subcommand_from add-peer" -l yes -d 'Bypass confirmation'
 complete -c innernet -n "__fish_seen_subcommand_from add-peer" -s h -l help -d 'Prints help information'
@@ -64,13 +64,13 @@ complete -c innernet -n "__fish_seen_subcommand_from rename-peer" -l new-name -d
 complete -c innernet -n "__fish_seen_subcommand_from rename-peer" -l yes -d 'Bypass confirmation'
 complete -c innernet -n "__fish_seen_subcommand_from rename-peer" -s h -l help -d 'Prints help information'
 complete -c innernet -n "__fish_seen_subcommand_from rename-peer" -s V -l version -d 'Prints version information'
-complete -c innernet -n "__fish_seen_subcommand_from add-cidr" -l name -d 'The CIDR name (eg. "engineers")'
-complete -c innernet -n "__fish_seen_subcommand_from add-cidr" -l cidr -d 'The CIDR network (eg. "10.42.5.0/24")'
+complete -c innernet -n "__fish_seen_subcommand_from add-cidr" -l name -d 'The CIDR name (eg. \'engineers\')'
+complete -c innernet -n "__fish_seen_subcommand_from add-cidr" -l cidr -d 'The CIDR network (eg. \'10.42.5.0/24\')'
 complete -c innernet -n "__fish_seen_subcommand_from add-cidr" -l parent -d 'The CIDR parent name'
 complete -c innernet -n "__fish_seen_subcommand_from add-cidr" -l yes -d 'Bypass confirmation'
 complete -c innernet -n "__fish_seen_subcommand_from add-cidr" -s h -l help -d 'Prints help information'
 complete -c innernet -n "__fish_seen_subcommand_from add-cidr" -s V -l version -d 'Prints version information'
-complete -c innernet -n "__fish_seen_subcommand_from delete-cidr" -l name -d 'The CIDR name (eg. "engineers")'
+complete -c innernet -n "__fish_seen_subcommand_from delete-cidr" -l name -d 'The CIDR name (eg. \'engineers\')'
 complete -c innernet -n "__fish_seen_subcommand_from delete-cidr" -l yes -d 'Bypass confirmation'
 complete -c innernet -n "__fish_seen_subcommand_from delete-cidr" -s h -l help -d 'Prints help information'
 complete -c innernet -n "__fish_seen_subcommand_from delete-cidr" -s V -l version -d 'Prints version information'
diff --git a/doc/innernet.completions.powershell b/doc/innernet.completions.powershell
index dd6463b..4a1f131 100644
--- a/doc/innernet.completions.powershell
+++ b/doc/innernet.completions.powershell
@@ -34,7 +34,7 @@ Register-ArgumentCompleter -Native -CommandName 'innernet' -ScriptBlock {
             [CompletionResult]::new('up', 'up', [CompletionResultType]::ParameterValue, 'Bring up your local interface, and update it with latest peer list')
             [CompletionResult]::new('fetch', 'fetch', [CompletionResultType]::ParameterValue, 'Fetch and update your local interface with the latest peer list')
             [CompletionResult]::new('uninstall', 'uninstall', [CompletionResultType]::ParameterValue, 'Uninstall an innernet network')
-            [CompletionResult]::new('down', 'down', [CompletionResultType]::ParameterValue, 'Bring down the interface (equivalent to "wg-quick down <interface>")')
+            [CompletionResult]::new('down', 'down', [CompletionResultType]::ParameterValue, 'Bring down the interface (equivalent to ''wg-quick down <interface>'')')
             [CompletionResult]::new('add-peer', 'add-peer', [CompletionResultType]::ParameterValue, 'Add a new peer')
             [CompletionResult]::new('rename-peer', 'rename-peer', [CompletionResultType]::ParameterValue, 'Rename a peer')
             [CompletionResult]::new('add-cidr', 'add-cidr', [CompletionResultType]::ParameterValue, 'Add a new CIDR')
@@ -116,7 +116,7 @@ Register-ArgumentCompleter -Native -CommandName 'innernet' -ScriptBlock {
             [CompletionResult]::new('--cidr', 'cidr', [CompletionResultType]::ParameterName, 'Name of CIDR to add new peer under')
             [CompletionResult]::new('--admin', 'admin', [CompletionResultType]::ParameterName, 'Make new peer an admin?')
             [CompletionResult]::new('--save-config', 'save-config', [CompletionResultType]::ParameterName, 'Save the config to the given location')
-            [CompletionResult]::new('--invite-expires', 'invite-expires', [CompletionResultType]::ParameterName, 'Invite expiration period (eg. "30d", "7w", "2h", "60m", "1000s")')
+            [CompletionResult]::new('--invite-expires', 'invite-expires', [CompletionResultType]::ParameterName, 'Invite expiration period (eg. ''30d'', ''7w'', ''2h'', ''60m'', ''1000s'')')
             [CompletionResult]::new('--auto-ip', 'auto-ip', [CompletionResultType]::ParameterName, 'Auto-assign the peer the first available IP within the CIDR')
             [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Bypass confirmation')
             [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information')
@@ -136,8 +136,8 @@ Register-ArgumentCompleter -Native -CommandName 'innernet' -ScriptBlock {
             break
         }
         'innernet;add-cidr' {
-            [CompletionResult]::new('--name', 'name', [CompletionResultType]::ParameterName, 'The CIDR name (eg. "engineers")')
-            [CompletionResult]::new('--cidr', 'cidr', [CompletionResultType]::ParameterName, 'The CIDR network (eg. "10.42.5.0/24")')
+            [CompletionResult]::new('--name', 'name', [CompletionResultType]::ParameterName, 'The CIDR name (eg. ''engineers'')')
+            [CompletionResult]::new('--cidr', 'cidr', [CompletionResultType]::ParameterName, 'The CIDR network (eg. ''10.42.5.0/24'')')
             [CompletionResult]::new('--parent', 'parent', [CompletionResultType]::ParameterName, 'The CIDR parent name')
             [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Bypass confirmation')
             [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information')
@@ -147,7 +147,7 @@ Register-ArgumentCompleter -Native -CommandName 'innernet' -ScriptBlock {
             break
         }
         'innernet;delete-cidr' {
-            [CompletionResult]::new('--name', 'name', [CompletionResultType]::ParameterName, 'The CIDR name (eg. "engineers")')
+            [CompletionResult]::new('--name', 'name', [CompletionResultType]::ParameterName, 'The CIDR name (eg. ''engineers'')')
             [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Bypass confirmation')
             [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information')
             [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Prints help information')
diff --git a/doc/innernet.completions.zsh b/doc/innernet.completions.zsh
index ace7220..3816e19 100644
--- a/doc/innernet.completions.zsh
+++ b/doc/innernet.completions.zsh
@@ -48,21 +48,6 @@ _arguments "${_arguments_options[@]}" \
 ':invite -- Path to the invitation file:_files' \
 && ret=0
 ;;
-(redeem)
-_arguments "${_arguments_options[@]}" \
-'--hosts-path=[The path to write hosts to]' \
-'(--default-name)--name=[Set a specific interface name]' \
-'(--hosts-path)--no-write-hosts[Don'\''t write to any hosts files]' \
-'--default-name[Use the network name inside the invitation as the interface name]' \
-'-d[Delete the invitation after a successful install]' \
-'--delete-invite[Delete the invitation after a successful install]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':invite -- Path to the invitation file:_files' \
-&& ret=0
-;;
 (install)
 _arguments "${_arguments_options[@]}" \
 '--hosts-path=[The path to write hosts to]' \
@@ -91,19 +76,6 @@ _arguments "${_arguments_options[@]}" \
 '::interface:_files' \
 && ret=0
 ;;
-(list)
-_arguments "${_arguments_options[@]}" \
-'-s[One-line peer list]' \
-'--short[One-line peer list]' \
-'-t[Display peers in a tree based on the CIDRs]' \
-'--tree[Display peers in a tree based on the CIDRs]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'::interface:_files' \
-&& ret=0
-;;
 (show)
 _arguments "${_arguments_options[@]}" \
 '-s[One-line peer list]' \
@@ -167,7 +139,7 @@ _arguments "${_arguments_options[@]}" \
 '--cidr=[Name of CIDR to add new peer under]' \
 '--admin=[Make new peer an admin?]' \
 '--save-config=[Save the config to the given location]' \
-'--invite-expires=[Invite expiration period (eg. "30d", "7w", "2h", "60m", "1000s")]' \
+'--invite-expires=[Invite expiration period (eg. '\''30d'\'', '\''7w'\'', '\''2h'\'', '\''60m'\'', '\''1000s'\'')]' \
 '--auto-ip[Auto-assign the peer the first available IP within the CIDR]' \
 '--yes[Bypass confirmation]' \
 '-h[Prints help information]' \
@@ -191,8 +163,8 @@ _arguments "${_arguments_options[@]}" \
 ;;
 (add-cidr)
 _arguments "${_arguments_options[@]}" \
-'--name=[The CIDR name (eg. "engineers")]' \
-'--cidr=[The CIDR network (eg. "10.42.5.0/24")]' \
+'--name=[The CIDR name (eg. '\''engineers'\'')]' \
+'--cidr=[The CIDR network (eg. '\''10.42.5.0/24'\'')]' \
 '--parent=[The CIDR parent name]' \
 '--yes[Bypass confirmation]' \
 '-h[Prints help information]' \
@@ -204,7 +176,7 @@ _arguments "${_arguments_options[@]}" \
 ;;
 (delete-cidr)
 _arguments "${_arguments_options[@]}" \
-'--name=[The CIDR name (eg. "engineers")]' \
+'--name=[The CIDR name (eg. '\''engineers'\'')]' \
 '--yes[Bypass confirmation]' \
 '-h[Prints help information]' \
 '--help[Prints help information]' \
@@ -323,7 +295,7 @@ _innernet_commands() {
 "up:Bring up your local interface, and update it with latest peer list" \
 "fetch:Fetch and update your local interface with the latest peer list" \
 "uninstall:Uninstall an innernet network" \
-"down:Bring down the interface (equivalent to "wg-quick down <interface>")" \
+"down:Bring down the interface (equivalent to 'wg-quick down <interface>')" \
 "add-peer:Add a new peer" \
 "rename-peer:Rename a peer" \
 "add-cidr:Add a new CIDR" \
diff --git a/server/Cargo.toml b/server/Cargo.toml
index bfe01cf..faf7f80 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -6,7 +6,7 @@ license = "MIT"
 name = "server"
 publish = false
 readme = "README.md"
-version = "1.5.0"
+version = "1.5.1"
 
 [[bin]]
 name = "innernet-server"
diff --git a/shared/Cargo.toml b/shared/Cargo.toml
index 9935af5..cd0e1e4 100644
--- a/shared/Cargo.toml
+++ b/shared/Cargo.toml
@@ -4,7 +4,7 @@ edition = "2018"
 license = "MIT"
 name = "shared"
 publish = false
-version = "1.5.0"
+version = "1.5.1"
 
 [dependencies]
 anyhow = "1"
diff --git a/wireguard-control-sys/Cargo.toml b/wireguard-control-sys/Cargo.toml
index af9d10e..2a47185 100644
--- a/wireguard-control-sys/Cargo.toml
+++ b/wireguard-control-sys/Cargo.toml
@@ -6,7 +6,7 @@ license = "LGPL-2.1-or-later"
 name = "wireguard-control-sys"
 readme = "README.md"
 repository = "https://github.com/tonarino/innernet"
-version = "1.5.0"
+version = "1.5.1"
 
 [dependencies]
 libc = "0.2"
diff --git a/wireguard-control/Cargo.toml b/wireguard-control/Cargo.toml
index 2b6227f..2694f05 100644
--- a/wireguard-control/Cargo.toml
+++ b/wireguard-control/Cargo.toml
@@ -7,7 +7,7 @@ license = "LGPL-2.1-or-later"
 name = "wireguard-control"
 readme = "README.md"
 repository = "https://github.com/tonarino/innernet"
-version = "1.5.0"
+version = "1.5.1"
 
 [dependencies]
 base64 = "0.13"
@@ -15,7 +15,7 @@ hex = "0.4"
 libc = "0.2"
 
 [target.'cfg(target_os = "linux")'.dependencies]
-wireguard-control-sys = { path = "../wireguard-control-sys", version = "1.5.0" }
+wireguard-control-sys = { path = "../wireguard-control-sys", version = "1.5.1" }
 
 [target.'cfg(not(target_os = "linux"))'.dependencies]
 rand_core = "0.6"