diff --git a/src/interfaces/reader/eas3.c b/src/interfaces/reader/eas3.c
index b5a3554..868f1bf 100644
--- a/src/interfaces/reader/eas3.c
+++ b/src/interfaces/reader/eas3.c
@@ -223,8 +223,8 @@ endian_conversion(void          *value,
 !                                                                                                            !
 !   DESCRIPTION:                                                                                             !
 !   ------------                                                                                             !
-!                This function deallocates the data structure used to store an numerical dataset             !
-!                and can be called if an error occurs or once the data is no longer needed is to be closed.  !
+!                This function deallocates the data structure used to store a numerical dataset              !
+!                and can be called if an error occurs or once the data is no longer needed.                  !
 !                The deallocation will be carried out down to the structure levels that have been allocated. !
 !                                                                                                            !
 \*----------------------------------------------------------------------------------------------------------*/
diff --git a/src/tools/bwccmdl.c b/src/tools/bwccmdl.c
index db9f10e..8df4e9c 100644
--- a/src/tools/bwccmdl.c
+++ b/src/tools/bwccmdl.c
@@ -153,7 +153,7 @@ static char bwc_header[] = "====================================================
  */
 /*================================================================================================*/
 const char *argp_program_version      = "bwc 0.1.0";
-const char *argp_program_bug_address  = "hpcpvogl@hlrs.de";
+const char *argp_program_bug_address  = "patrick.vogler@hlrs.de";
 
 /*================================================================================================*/
 /**
@@ -614,7 +614,7 @@ parse_opt(int                key,
 
           if (verify_opt(arg, ',', true) == EXIT_FAILURE)
             {
-              argp_error(state, "Invalid delimitnator in the bitrate option\n");
+              argp_error(state, "Invalid deliminator in the bitrate option\n");
             }
 
           for(bitrate = strtod(arg, &end), i = 0; arg != end && i < 10;
@@ -648,7 +648,7 @@ parse_opt(int                key,
 
           if (verify_opt(arg, ',', false) == EXIT_FAILURE)
             {
-              argp_error(state, "Invalid delimitnator in the codeblock"
+              argp_error(state, "Invalid deliminator in the codeblock"
                                 " size option.\n");
             }
 
@@ -702,7 +702,7 @@ parse_opt(int                key,
 
           if (verify_opt(arg, ',', true) == EXIT_FAILURE)
             {
-              argp_error(state, "Invalid delimitnator in the compression"
+              argp_error(state, "Invalid deliminator in the compression"
                                 " ratio option \n");
             }
 
@@ -737,7 +737,7 @@ parse_opt(int                key,
 
           if (verify_opt(arg, ',', false) == EXIT_FAILURE)
             {
-              argp_error(state, "Invalid delimitnator in the decomposition"
+              argp_error(state, "Invalid deliminator in the decomposition"
                                 " level option.\n");
             }
 
@@ -933,7 +933,7 @@ parse_opt(int                key,
 
           if (verify_opt(arg, ',', false) == EXIT_FAILURE)
             {
-              argp_error(state, "Invalid delimitnator in the tile"
+              argp_error(state, "Invalid deliminator in the tile"
                                 " size option.\n");
             }
 
@@ -981,7 +981,7 @@ parse_opt(int                key,
 
           if (verify_opt(arg, ',', false) == EXIT_FAILURE)
             {
-              argp_error(state, "Invalid delimitnator in the precinct"
+              argp_error(state, "Invalid deliminator in the precinct"
                                 " size option.\n");
             }
 
@@ -1189,7 +1189,7 @@ int main(int argc, char *argv[])
         }
 
       /* Evaluate the input and output buffer size and initial- *
-       * ize the BigWhoop data and coder structs.               */
+       * size the BigWhoop data and coder structs.              */
       size = data->params.ndim1 * data->params.ndim2 *
              data->params.ndim3 * data->params.nts   *
              data->params.npar;