diff --git a/todo.sh b/todo.sh
index 83c4778..ccc8ec7 100755
--- a/todo.sh
+++ b/todo.sh
@@ -4,16 +4,17 @@
 # Place the .todo/config file in your home directory or use the -d option for a custom location.
 
 [ -f VERSION-FILE ] && . VERSION-FILE || VERSION="@DEV_VERSION@"
-version() { sed -e 's/^    //' <<EndVersion
-        TODO.TXT Command Line Interface v$VERSION
-        
-        First release: 5/11/2006
-        Original conception by: Gina Trapani (http://ginatrapani.org)
-        Contributors: http://github.com/ginatrapani/todo.txt-cli/network
-        License: GPL, http://www.gnu.org/copyleft/gpl.html
-        More information and mailing list at http://todotxt.com
-        Code repository: http://github.com/ginatrapani/todo.txt-cli/tree/master
-EndVersion
+version() {
+    cat <<-EndVersion
+		TODO.TXT Command Line Interface v$VERSION
+
+		First release: 5/11/2006
+		Original conception by: Gina Trapani (http://ginatrapani.org)
+		Contributors: http://github.com/ginatrapani/todo.txt-cli/network
+		License: GPL, http://www.gnu.org/copyleft/gpl.html
+		More information and mailing list at http://todotxt.com
+		Code repository: http://github.com/ginatrapani/todo.txt-cli/tree/master
+	EndVersion
     exit 1
 }
 
@@ -26,202 +27,202 @@ oneline_usage="$TODO_SH [-fhpantvV] [-d todo_config] action [task_number] [task_
 
 usage()
 {
-    sed -e 's/^    //' <<EndUsage
-    Usage: $oneline_usage
-    Try '$TODO_SH -h' for more information.
-EndUsage
+    cat <<-EndUsage
+		Usage: $oneline_usage
+		Try '$TODO_SH -h' for more information.
+	EndUsage
     exit 1
 }
 
 shorthelp()
 {
-    sed -e 's/^    //' <<EndHelp
-      Usage: $oneline_usage
+    cat <<-EndHelp
+		  Usage: $oneline_usage
 
-      Actions:
-        add|a "THING I NEED TO DO +project @context"
-        addto DEST "TEXT TO ADD"
-        addm "THINGS I NEED TO DO
-              MORE THINGS I NEED TO DO"
-        append|app NUMBER "TEXT TO APPEND"
-        archive
-        command [ACTIONS]
-        del|rm NUMBER [TERM]
-        dp|depri NUMBER
-        do NUMBER
-        help
-        list|ls [TERM...]
-        listall|lsa [TERM...]
-        listcon|lsc
-        listfile|lf SRC [TERM...]
-        listpri|lsp [PRIORITY]
-        listproj|lsprj
-        move|mv NUMBER DEST [SRC]
-        prepend|prep NUMBER "TEXT TO PREPEND"
-        pri|p NUMBER PRIORITY
-        replace NUMBER "UPDATED TODO"
-        report
+		  Actions:
+		    add|a "THING I NEED TO DO +project @context"
+		    addto DEST "TEXT TO ADD"
+		    addm "THINGS I NEED TO DO
+		          MORE THINGS I NEED TO DO"
+		    append|app NUMBER "TEXT TO APPEND"
+		    archive
+		    command [ACTIONS]
+		    del|rm NUMBER [TERM]
+		    dp|depri NUMBER
+		    do NUMBER
+		    help
+		    list|ls [TERM...]
+		    listall|lsa [TERM...]
+		    listcon|lsc
+		    listfile|lf SRC [TERM...]
+		    listpri|lsp [PRIORITY]
+		    listproj|lsprj
+		    move|mv NUMBER DEST [SRC]
+		    prepend|prep NUMBER "TEXT TO PREPEND"
+		    pri|p NUMBER PRIORITY
+		    replace NUMBER "UPDATED TODO"
+		    report
 
-      See "help" for more details.
-EndHelp
+		  See "help" for more details.
+	EndHelp
     exit 0
 }
 
 help()
 {
-    sed -e 's/^    //' <<EndHelp
-      Usage: $oneline_usage
+    cat <<-EndHelp
+		  Usage: $oneline_usage
 
-      Actions:
-        add "THING I NEED TO DO +project @context"
-        a "THING I NEED TO DO +project @context"
-          Adds THING I NEED TO DO to your todo.txt file on its own line.
-          Project and context notation optional.
-          Quotes optional.
+		  Actions:
+		    add "THING I NEED TO DO +project @context"
+		    a "THING I NEED TO DO +project @context"
+		      Adds THING I NEED TO DO to your todo.txt file on its own line.
+		      Project and context notation optional.
+		      Quotes optional.
 
-        addm "FIRST THING I NEED TO DO +project1 @context
-        SECOND THING I NEED TO DO +project2 @context"
-          Adds FIRST THING I NEED TO DO to your todo.txt on its own line and
-          Adds SECOND THING I NEED TO DO to you todo.txt on its own line.
-          Project and context notation optional.
-          Quotes optional.
+		    addm "FIRST THING I NEED TO DO +project1 @context
+		    SECOND THING I NEED TO DO +project2 @context"
+		      Adds FIRST THING I NEED TO DO to your todo.txt on its own line and
+		      Adds SECOND THING I NEED TO DO to you todo.txt on its own line.
+		      Project and context notation optional.
+		      Quotes optional.
 
-        addto DEST "TEXT TO ADD"
-          Adds a line of text to any file located in the todo.txt directory.
-          For example, addto inbox.txt "decide about vacation"
+		    addto DEST "TEXT TO ADD"
+		      Adds a line of text to any file located in the todo.txt directory.
+		      For example, addto inbox.txt "decide about vacation"
 
-        append NUMBER "TEXT TO APPEND"
-        app NUMBER "TEXT TO APPEND"
-          Adds TEXT TO APPEND to the end of the todo on line NUMBER.
-          Quotes optional.
+		    append NUMBER "TEXT TO APPEND"
+		    app NUMBER "TEXT TO APPEND"
+		      Adds TEXT TO APPEND to the end of the todo on line NUMBER.
+		      Quotes optional.
 
-        archive
-          Moves done items from todo.txt to done.txt and removes blank lines.
+		    archive
+		      Moves done items from todo.txt to done.txt and removes blank lines.
 
-        command [ACTIONS]
-          Runs the remaining arguments using only todo.sh builtins.
-          Will not call any .todo.actions.d scripts.
+		    command [ACTIONS]
+		      Runs the remaining arguments using only todo.sh builtins.
+		      Will not call any .todo.actions.d scripts.
 
-        del NUMBER [TERM]
-        rm NUMBER [TERM]
-          Deletes the item on line NUMBER in todo.txt.
-          If term specified, deletes only the term from the line.
+		    del NUMBER [TERM]
+		    rm NUMBER [TERM]
+		      Deletes the item on line NUMBER in todo.txt.
+		      If term specified, deletes only the term from the line.
 
-        depri NUMBER
-        dp NUMBER
-          Deprioritizes (removes the priority) from the item
-          on line NUMBER in todo.txt.
+		    depri NUMBER
+		    dp NUMBER
+		      Deprioritizes (removes the priority) from the item
+		      on line NUMBER in todo.txt.
 
-        do NUMBER[, NUMBER, NUMBER, ...]
-          Marks item(s) on line NUMBER as done in todo.txt.
+		    do NUMBER[, NUMBER, NUMBER, ...]
+		      Marks item(s) on line NUMBER as done in todo.txt.
 
-        help
-          Display this help message.
+		    help
+		      Display this help message.
 
-        list [TERM...]
-        ls [TERM...]
-          Displays all todo's that contain TERM(s) sorted by priority with line
-          numbers.  If no TERM specified, lists entire todo.txt.
+		    list [TERM...]
+		    ls [TERM...]
+		      Displays all todo's that contain TERM(s) sorted by priority with line
+		      numbers.  If no TERM specified, lists entire todo.txt.
 
-        listall [TERM...]
-        lsa [TERM...]
-          Displays all the lines in todo.txt AND done.txt that contain TERM(s)
-          sorted by priority with line  numbers.  If no TERM specified, lists
-          entire todo.txt AND done.txt concatenated and sorted.
+		    listall [TERM...]
+		    lsa [TERM...]
+		      Displays all the lines in todo.txt AND done.txt that contain TERM(s)
+		      sorted by priority with line  numbers.  If no TERM specified, lists
+		      entire todo.txt AND done.txt concatenated and sorted.
 
-        listcon
-        lsc
-          Lists all the task contexts that start with the @ sign in todo.txt.
+		    listcon
+		    lsc
+		      Lists all the task contexts that start with the @ sign in todo.txt.
 
-        listfile SRC [TERM...]
-        lf SRC [TERM...]
-          Displays all the lines in SRC file located in the todo.txt directory,
-          sorted by priority with line  numbers.  If TERM specified, lists
-          all lines that contain TERM in SRC file.
+		    listfile SRC [TERM...]
+		    lf SRC [TERM...]
+		      Displays all the lines in SRC file located in the todo.txt directory,
+		      sorted by priority with line  numbers.  If TERM specified, lists
+		      all lines that contain TERM in SRC file.
 
-        listpri [PRIORITY]
-        lsp [PRIORITY]
-          Displays all items prioritized PRIORITY.
-          If no PRIORITY specified, lists all prioritized items.
+		    listpri [PRIORITY]
+		    lsp [PRIORITY]
+		      Displays all items prioritized PRIORITY.
+		      If no PRIORITY specified, lists all prioritized items.
 
-        listproj
-        lsprj
-          Lists all the projects that start with the + sign in todo.txt.
+		    listproj
+		    lsprj
+		      Lists all the projects that start with the + sign in todo.txt.
 
-        move NUMBER DEST [SRC]
-        mv NUMBER DEST [SRC]
-          Moves a line from source text file (SRC) to destination text file (DEST).
-          Both source and destination file must be located in the directory defined
-          in the configuration directory.  When SRC is not defined
-          it's by default todo.txt.
+		    move NUMBER DEST [SRC]
+		    mv NUMBER DEST [SRC]
+		      Moves a line from source text file (SRC) to destination text file (DEST).
+		      Both source and destination file must be located in the directory defined
+		      in the configuration directory.  When SRC is not defined
+		      it's by default todo.txt.
 
-        prepend NUMBER "TEXT TO PREPEND"
-        prep NUMBER "TEXT TO PREPEND"
-          Adds TEXT TO PREPEND to the beginning of the todo on line NUMBER.
-          Quotes optional.
+		    prepend NUMBER "TEXT TO PREPEND"
+		    prep NUMBER "TEXT TO PREPEND"
+		      Adds TEXT TO PREPEND to the beginning of the todo on line NUMBER.
+		      Quotes optional.
 
-        pri NUMBER PRIORITY
-        p NUMBER PRIORITY
-          Adds PRIORITY to todo on line NUMBER.  If the item is already
-          prioritized, replaces current priority with new PRIORITY.
-          PRIORITY must be an uppercase letter between A and Z.
+		    pri NUMBER PRIORITY
+		    p NUMBER PRIORITY
+		      Adds PRIORITY to todo on line NUMBER.  If the item is already
+		      prioritized, replaces current priority with new PRIORITY.
+		      PRIORITY must be an uppercase letter between A and Z.
 
-        replace NUMBER "UPDATED TODO"
-          Replaces todo on line NUMBER with UPDATED TODO.
+		    replace NUMBER "UPDATED TODO"
+		      Replaces todo on line NUMBER with UPDATED TODO.
 
-        report
-          Adds the number of open todo's and closed done's to report.txt.
+		    report
+		      Adds the number of open todo's and closed done's to report.txt.
 
 
 
-      Options:
-        -@
-            Hide context names in list output. Use twice to show context
-            names (default).
-        -+
-            Hide project names in list output. Use twice to show project
-            names (default).
-        -d CONFIG_FILE
-            Use a configuration file other than the default ~/.todo/config
-        -f
-            Forces actions without confirmation or interactive input
-        -h
-            Display a short help message
-        -p
-            Plain mode turns off colors
-        -P
-            Hide priority labels in list output. Use twice to show
-            priority labels (default).
-        -a
-            Don't auto-archive tasks automatically on completion
-        -n
-            Don't preserve line numbers; automatically remove blank lines
-            on task deletion
-        -t
-            Prepend the current date to a task automatically
-            when it's added.
-        -v
-            Verbose mode turns on confirmation messages
-        -vv
-            Extra verbose mode prints some debugging information
-        -V
-            Displays version, license and credits
-        -x
-            Disables TODOTXT_FINAL_FILTER
+		  Options:
+		    -@
+		        Hide context names in list output. Use twice to show context
+		        names (default).
+		    -+
+		        Hide project names in list output. Use twice to show project
+		        names (default).
+		    -d CONFIG_FILE
+		        Use a configuration file other than the default ~/.todo/config
+		    -f
+		        Forces actions without confirmation or interactive input
+		    -h
+		        Display a short help message
+		    -p
+		        Plain mode turns off colors
+		    -P
+		        Hide priority labels in list output. Use twice to show
+		        priority labels (default).
+		    -a
+		        Don't auto-archive tasks automatically on completion
+		    -n
+		        Don't preserve line numbers; automatically remove blank lines
+		        on task deletion
+		    -t
+		        Prepend the current date to a task automatically
+		        when it's added.
+		    -v
+		        Verbose mode turns on confirmation messages
+		    -vv
+		        Extra verbose mode prints some debugging information
+		    -V
+		        Displays version, license and credits
+		    -x
+		        Disables TODOTXT_FINAL_FILTER
 
 
-      Environment variables:
-        TODOTXT_AUTO_ARCHIVE=0          is same as option -a
-        TODOTXT_CFG_FILE=CONFIG_FILE    is same as option -d CONFIG_FILE
-        TODOTXT_FORCE=1                 is same as option -f
-        TODOTXT_PRESERVE_LINE_NUMBERS=0 is same as option -n
-        TODOTXT_PLAIN=1                 is same as option -p
-        TODOTXT_DATE_ON_ADD=1           is same as option -t
-        TODOTXT_VERBOSE=1               is same as option -v
-        TODOTXT_DEFAULT_ACTION=""       run this when called with no arguments
-        TODOTXT_SORT_COMMAND="sort ..." customize list output
-        TODOTXT_FINAL_FILTER="sed ..."  customize list after color, P@+ hiding
-EndHelp
+		  Environment variables:
+		    TODOTXT_AUTO_ARCHIVE=0          is same as option -a
+		    TODOTXT_CFG_FILE=CONFIG_FILE    is same as option -d CONFIG_FILE
+		    TODOTXT_FORCE=1                 is same as option -f
+		    TODOTXT_PRESERVE_LINE_NUMBERS=0 is same as option -n
+		    TODOTXT_PLAIN=1                 is same as option -p
+		    TODOTXT_DATE_ON_ADD=1           is same as option -t
+		    TODOTXT_VERBOSE=1               is same as option -v
+		    TODOTXT_DEFAULT_ACTION=""       run this when called with no arguments
+		    TODOTXT_SORT_COMMAND="sort ..." customize list output
+		    TODOTXT_FINAL_FILTER="sed ..."  customize list after color, P@+ hiding
+	EndHelp
 
     if [ -d "$TODO_ACTIONS_DIR" ]
     then