diff --git a/README.md b/README.md
index 3df5789..a3a0cdc 100644
--- a/README.md
+++ b/README.md
@@ -144,7 +144,9 @@ Every record is encrypted using a **unique** password, protecting the user again
 
 The Argon2id variant with 1 iteration and maximum available memory is recommended as a default setting for all environments. This setting is secure against side-channel attacks and maximizes adversarial costs on dedicated bruteforce hardware.
 
-> If one of the devices that will handle the database has 1GB of memory or less, we recommend setting the *memory* value to the half of that device RAM availability. Otherwise, default values should be fine.
+> If one of the devices that will handle the database has 1GB of memory or less, we recommend setting the *memory* value according to that device's RAM availability.
+>
+> The command `kure config argon2 test` provides a way of testing the performance implications of different parameter combinations on your device.
 
 ### Memory security
 
diff --git a/auth/auth.go b/auth/auth.go
index 1c51482..4074f13 100644
--- a/auth/auth.go
+++ b/auth/auth.go
@@ -120,7 +120,7 @@ func askArgon2Params(r io.Reader) (authDB.Argon2, error) {
 		return authDB.Argon2{}, err
 	}
 
-	// memory is measured in kibibytes, 1 kibibyte = 1024 bytes. 1048576 kibibytes -> 1GB
+	// memory is measured in kibibytes, 1 kibibyte = 1024 bytes. 1048576 kibibytes -> 1GiB
 	memory, err := scanParameter(reader, "Memory", 1<<20)
 	if err != nil {
 		return authDB.Argon2{}, err
diff --git a/commands/config/argon2/test/test.go b/commands/config/argon2/test/test.go
index ae41952..f06d046 100644
--- a/commands/config/argon2/test/test.go
+++ b/commands/config/argon2/test/test.go
@@ -33,11 +33,11 @@ func NewCmd() *cobra.Command {
 		
 The Argon2id variant with 1 iteration and maximum available memory is recommended as a default setting for all environments. This setting is secure against side-channel attacks and maximizes adversarial costs on dedicated bruteforce hardware.
 
-If one of the devices that will handle the database has lower than 1GB of memory, we recommend setting the memory value to the half of that device RAM availability. Otherwise, default values should be fine.
+If one of the devices that will handle the database has lower than 1GB of memory, we recommend setting the memory according to that device's RAM availability.
 
-• Memory: amount of memory allowed for argon2 to use. There is no "insecure" value for this parameter, though clearly the more memory the better. The value is represented in kibibytes, 1 kibibyte = 1024 bytes. Default is 1048576 kibibytes (1024 MB).
+• Memory: amount of memory allowed for argon2 to use, the more memory the better. The value is represented in kibibytes, 1 kibibyte = 1024 bytes. Default is 1048576 kibibytes (1 GiB).
 
-• Iterations: number of passes over the memory. The running time depends linearly on this parameter. Again, there is no "insecure value". Default is 1.
+• Iterations: number of passes over the memory. The running time depends linearly on this parameter. Default is 1.
 
 • Threads: number of threads number in parallel. Default is the maximum number of logical CPUs usable.`,
 		Example: example,
diff --git a/docs/commands/config/subcommands/argon2/subcommands/test.md b/docs/commands/config/subcommands/argon2/subcommands/test.md
index a80da64..83ab87f 100644
--- a/docs/commands/config/subcommands/argon2/subcommands/test.md
+++ b/docs/commands/config/subcommands/argon2/subcommands/test.md
@@ -8,11 +8,11 @@ Test how is argon2 going to perform with the parameters passed.
 
 The Argon2id variant with 1 iteration and maximum available memory is recommended as a default setting for all environments. This setting is secure against side-channel attacks and maximizes adversarial costs on dedicated bruteforce hardware.
 
-If one of the devices that will handle the database has lower than 1GB of memory, we recommend setting the memory value to the half of that device RAM availability. Otherwise, default values should be fine.
+> If one of the devices that will handle the database has lower than 1GB of memory, we recommend setting the memory according to that device's RAM availability.
 
-- Memory: amount of memory allowed for argon2 to use. There is no "insecure" value for this parameter, though clearly the more memory the better. The value is represented in kibibytes, 1 kibibyte = 1024 bytes. Default is 1048576 kibibytes (1024 MB).
+- Memory: amount of memory allowed for argon2 to use, the more memory the better. The value is represented in kibibytes, 1 kibibyte = 1024 bytes. Default is 1048576 kibibytes (1 GiB).
 
-- Iterations: number of passes over the memory. The running time depends linearly on this parameter. Again, there is no "insecure value". Default is 1.
+- Iterations: number of passes over the memory. The running time depends linearly on this parameter. Default is 1.
 
 - Threads: number of threads number in parallel. Default is the maximum number of logical CPUs usable.
 
@@ -26,7 +26,7 @@ If one of the devices that will handle the database has lower than 1GB of memory
 
 ### Examples
 
-Test using 700MB of memory, 2 iterations and 4 threads:
+Test using 700MiB of memory, 2 iterations and 4 threads:
 ```
 kure config argon2 test -m 716800 -i 2 -t 4
 ```
\ No newline at end of file