diff --git a/src/compl/arg.rs b/src/compl/arg.rs
index adbbde1..eed6f51 100644
--- a/src/compl/arg.rs
+++ b/src/compl/arg.rs
@@ -29,6 +29,7 @@ pub fn matches<'a>(m: &'a ArgMatches) -> Result<Option<Command<'a>>> {
 /// Completion subcommands.
 pub fn subcmds<'a>() -> Vec<App<'a, 'a>> {
     vec![SubCommand::with_name("completion")
+        .aliases(&["completions", "compl", "compe", "comp"])
         .about("Generates the completion script for the given shell")
         .args(&[Arg::with_name("shell")
             .possible_values(&Shell::variants()[..])
diff --git a/src/main.rs b/src/main.rs
index 540379c..99c911a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -56,7 +56,7 @@ fn main() -> Result<()> {
     let app = create_app();
     let m = app.get_matches();
 
-    // Check completion match BEFORE any entity or service initialization.
+    // Check completion match BEFORE entities and services initialization.
     // See https://github.com/soywod/himalaya/issues/115.
     match compl::arg::matches(&m)? {
         Some(compl::arg::Command::Generate(shell)) => {