diff --git a/AUTHORS b/AUTHORS
index 0d57c48ab..1690dc918 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,13 +1,10 @@
-Principal Author:
-  Paul Beckingham
+The development of task was made possible by the significant contributions of the following people:
+  Paul Beckingham    (Principal Author)
+  Federico Hernandez (Package Maintainer & Contributing Author)
+  David J Patrick    (Designer)
+  John Florian       (Contributing Author)
 
-Package Maintainer & Contributing Author:
-  Federico Hernandez
-
-Designer:
-  David J Patrick
-
-Contributing Authors:
+The following submitted code, packages or analysis, and deserve special thanks:
   Damian Glenny
   Andy Lester
   H. İbrahim Güngör
@@ -20,9 +17,8 @@ Contributing Authors:
   P.C. Shyamshankar
   Johan Friis
   Steven de Brouwer
-  John Florian
 
-With thanks to:
+Thanks to the following, who submitted detailed bug reports and excellent suggestions:
   Eugene Kramer
   Srijith K
   Bruce Israel
diff --git a/src/Context.cpp b/src/Context.cpp
index 2518a661c..6bdab5181 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -67,7 +67,9 @@ void Context::initialize (int argc, char** argv)
     if (i == 0)
     {
       program = argv[i];
-      if (program.find ("cal") != std::string::npos)
+      std::string::size_type cal = program.find ("/cal");
+      if (program == "cal" ||
+          (cal != std::string::npos && program.length () == cal + 4))
         args.push_back ("calendar");
     }
     else
diff --git a/src/main.cpp b/src/main.cpp
index a85ee68c5..9b57cc727 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -49,7 +49,10 @@ int main (int argc, char** argv)
   try
   {
     context.initialize (argc, argv);
-    if (context.program.find ("itask") != std::string::npos)
+
+    std::string::size_type itask = context.program.find ("/itask");
+    if (context.program == "itask" ||
+        (itask != std::string::npos && context.program.length () == itask + 5))
       status = context.interactive ();
     else
       status = context.run ();