diff --git a/messages/edge_storage/messages.go b/messages/edge_storage/messages.go
index a0cbc2785..51554ec47 100644
--- a/messages/edge_storage/messages.go
+++ b/messages/edge_storage/messages.go
@@ -24,8 +24,8 @@ const (
 	EXAMPLE_CREATE          = "$ azion create edge-storage\n$ azion create edge-storage --help"
 	EXAMPLE_CREATE_BUCKET   = "$ azion create edge-storage bucket --name 'zorosola' --edge-access 'read_only'\n$ azion create edge-storage bucket --help"
 	EXAMPLE_UPDATE_BUCKET   = "$ azion update edge-storage bucket --name 'zorosola' --edge-access 'read_only'\n$ azion update edge-storage bucket --help"
-	EXAMPLE_LIST            = "$ azion list edge-storage\n$ azion list edge-storage --help"
-	EXAMPLE_LIST_BUCKET     = "$ azion list edge-storage bucket\n$ $ azion list edge-storage objects --bucket-name nomedobalde"
+	EXAMPLE_LIST            = "$ azion list edge-storage bucket\n$ azion list edge-storage object --bucket-name nomedobalde\n$ azion list edge-storage --help"
+	EXAMPLE_LIST_BUCKET     = "$ azion list edge-storage bucket\n$ azion list edge-storage bucket --page 1 --page-size 3"
 	EXAMPLE_LIST_OBJECT     = "$ azion list edge-storage object --bucket-name 'balde'\n$ azion list edge-storage object --page-size 3 --details\n$ azion list edge-storage object --help"
 	EXAMPLE_DELETE          = "$ azion delete edge-storage\n$ azion delete edge-storage --help"
 	EXAMPLE_DELETE_BUCKET   = "$ azion delete edge-storage bucket --name 'bucket-name'\n$ azion delete edge-storage bucket --help"
@@ -33,7 +33,7 @@ const (
 	EXAMPLE_CREATE_OBJECTS  = "$ azion create edge-storage object --bucket-name 'mynewbucket' --object-key 'path/to/my/remote/file.txt' --source './local/file.txt'"
 	EXAMPLE_UPDATE_OBJECT   = "$ azion update edge-storage object --bucket-name 'mybalde' --object-key 'path/index.html' --source './index.html'\n$ azion update edge-storage object --help"
 	EXAMPLE_DESCRIBE        = "$ azion describe edge-storage\n$ azion describe edge-storage --help"
-	EXAMPLE_DESCRIBE_OBJECT = "$ azion describe edge-storage objects --help\n$ azion describe edge-storage objects --bucket-name 'asdf' --object-key 'test.json'\n$ azion describe edge-storage objects --bucket-name 'asdf' --object-key 'test.json' --format json\n$ azion describe edge-storage objects --bucket-name 'asdf' --object-key 'test.json' --out './tmp/test.json'"
+	EXAMPLE_DESCRIBE_OBJECT = "$ azion describe edge-storage object --help\n$ azion describe edge-storage object --bucket-name 'asdf' --object-key 'test.json'\n$ azion describe edge-storage objects --bucket-name 'asdf' --object-key 'test.json' --format json\n$ azion describe edge-storage objects --bucket-name 'asdf' --object-key 'test.json' --out './tmp/test.json'"
 	EXAMPLE_DELETE_OBJECTS  = "$ azion delete edge-storage object --bucket-name 'bucket-name'\n$ azion delete edge-storage object --help"
 
 	FLAG_HELP                      = "Displays more information about the edge-storage command"
@@ -42,7 +42,7 @@ const (
 	FLAG_HELP_LIST_OBJECT          = "Displays more information about the list edge-storege object command"
 	FLAG_HELP_DELETE_BUCKET        = "Displays more information about the delete edge-storege bucket command"
 	FLAG_NAME_BUCKET               = "The name of the Edge Storage bucket"
-	FLAG_FORCE                     = "Argument to force bucket delete"
+	FLAG_FORCE                     = "Indicates that the bucket should be emptied and deleted"
 	FLAG_EDGE_ACCESS_CREATE_BUCKET = "Indicates the type of permission for actions within the bucket. Possible values:	read_only, read_write or restricted"
 	FLAG_SOURCE_UPDATE_OBJECT      = "file path field to update the edge storage bucket object"
 	FLAG_FILE_JSON_CREATE_BUCKET   = "Path to a JSON file containing the attributes of the bucket that will be created; you can use - for reading from stdin"