diff --git a/Cargo.toml b/Cargo.toml
index 16b29335..d2a9dbf1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,8 +25,8 @@ clap = "2.33.0"
 crossterm = "0.14"
 failure = "0.1.6"
 fern = "0.5.9"
-futures-timer = "2.0.2"
-futures = "0.3.1"
+futures-timer = "3.0.1"
+futures = "0.3.3"
 heim = "0.0.9"
 log = "0.4.8"
 regex = "1.3.4"
diff --git a/README.md b/README.md
index 1c116a10..1a06f7ff 100644
--- a/README.md
+++ b/README.md
@@ -62,15 +62,17 @@ Run using `btm`.
 
 - `-h`, `--help` shows the help screen and exits.
 
-- `-a`, `--avgcpu` enables also showing the average CPU usage in addition to per-core CPU usage.
+- `-a`, `--avg_cpu` enables also showing the average CPU usage in addition to per-core CPU usage.
 
 - `-m`, `--dot-marker` uses a dot marker instead of the default braille marker.
 
-- `-c`, `--celsius` displays the temperature type in Celsius. This is the default.
+- Temperature units (you can only use one at a time):
 
-- `-f`, `--fahrenheit` displays the temperature type in Fahrenheit.
+  - `-c`, `--celsius` displays the temperature type in Celsius. This is the default.
 
-- `-k`, `--kelvin` displays the temperature type in Kelvin.
+  - `-f`, `--fahrenheit` displays the temperature type in Fahrenheit.
+
+  - `-k`, `--kelvin` displays the temperature type in Kelvin.
 
 - `-v`, `--version` displays the version number and exits.
 
@@ -84,11 +86,11 @@ Run using `btm`.
 
 - `-g`, `--group` will group together processes with the same name by default (equivalent to pressing `Tab`).
 
-- `-s`, `--case_sensitive` will default to matching case.
+- `-S`, `--case_sensitive` will default to matching case.
 
-- `-w`, `--whole` will default to searching for the world word.
+- `-W`, `--whole` will default to searching for the world word.
 
-- `-x`, `--regex` will default to using regex.
+- `-R`, `--regex` will default to using regex.
 
 when searching processes.
 
diff --git a/src/main.rs b/src/main.rs
index 9fb6b4c6..6db1356d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -60,13 +60,13 @@ fn main() -> error::Result<()> {
 		(version: crate_version!())
 		(author: crate_authors!())
 		(about: crate_description!())
-		(@arg AVG_CPU: -a --avgcpu "Enables showing the average CPU usage.")
+		(@arg AVG_CPU: -a --avg_cpu "Enables showing the average CPU usage.")
 		(@arg DOT_MARKER: -m --dot_marker "Use a dot marker instead of the default braille marker.")
 		(@arg DEBUG: -d --debug "Enables debug mode, which will output a log file.")
 		(@group TEMPERATURE_TYPE =>
-			(@arg CELSIUS : -c --celsius "Sets the temperature type to Celsius.  This is the default option.")
-			(@arg FAHRENHEIT : -f --fahrenheit "Sets the temperature type to Fahrenheit.")
 			(@arg KELVIN : -k --kelvin "Sets the temperature type to Kelvin.")
+			(@arg FAHRENHEIT : -f --fahrenheit "Sets the temperature type to Fahrenheit.")
+			(@arg CELSIUS : -c --celsius "Sets the temperature type to Celsius.  This is the default option.")
 		)
 		(@arg RATE_MILLIS: -r --rate +takes_value "Sets a refresh rate in milliseconds; the minimum is 250ms, defaults to 1000ms.  Smaller values may take more resources.")
 		(@arg LEFT_LEGEND: -l --left_legend "Puts external chart legends on the left side rather than the default right side.")
@@ -74,9 +74,9 @@ fn main() -> error::Result<()> {
 		//(@arg CONFIG_LOCATION: -co --config +takes_value "Sets the location of the config file.  Expects a config file in the JSON format.")
 		//(@arg BASIC_MODE: -b --basic "Sets bottom to basic mode, not showing graphs and only showing basic tables.")
 		(@arg GROUP_PROCESSES: -g --group "Groups processes with the same name together on launch.")
-		(@arg CASE_SENSITIVE: -s --case_sensitive "Match case when searching by default.")
-		(@arg WHOLE_WORD: -w --whole "Match whole word when searching by default.")
-		(@arg REGEX_DEFAULT: -x --regex "Use regex in searching by default.")
+		(@arg CASE_SENSITIVE: -S --case_sensitive "Match case when searching by default.")
+		(@arg WHOLE_WORD: -W --whole "Match whole word when searching by default.")
+		(@arg REGEX_DEFAULT: -R --regex "Use regex in searching by default.")
 	)
 	.get_matches();