diff --git a/bin/foamEndJob b/bin/foamEndJob
index 1c6b1c9438893c03429e9f1b961917a7795b68f4..b934d5addd6be67fe9e2b7a832bc2c93bd52ec91 100755
--- a/bin/foamEndJob
+++ b/bin/foamEndJob
@@ -35,8 +35,94 @@
 #       to restore controlDict
 #
 #-------------------------------------------------------------------------------
+Script=${0##*/}
 
-PROGNAME=`basename $0`
+usage() {
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    cat<<USAGE
+Usage: $Script [OPTION] <pid>
+Usage: $Script [OPTION] -c
+
+options:
+  -clear            use blockMesh reader  (uses .blockMesh extension)
+  -case <dir>       specify alternative case directory, default is the cwd
+  -now              stop at next time step
+  -help             print the usage
+
+Tries to end running OpenFOAM application at next write (or optionally
+at the next time step). It needs runTimeModifiable switched on in the
+controlDict. It changes stopAt in the controlDict and waits for the
+job to finish. Restores original controlDict if
+
+    - job has finished
+    - controlDict gets modified (by user)
+    - $Script gets killed.
+
+The -clear option clears any outstanding $Script for the case.
+
+USAGE
+    exit 1
+}
+
+unset clearOpt stopOpt
+
+# parse options
+while [ "$#" -gt 0 ]
+do
+    case "$1" in
+    -h | -help)
+        usage
+        ;;
+    -case)
+        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
+        cd "$2" 2>/dev/null || usage "directory does not exist:  '$2'"
+        shift 2
+        ;;
+    -c | -clear)
+        clearOpt=true
+        shift
+        ;;
+    -n | -now)
+        stopOpt=now
+        shift
+        ;;
+    -*)
+        usage "unknown option: '$*'"
+        ;;
+    *)
+        break
+        ;;
+    esac
+done
+
+
+# parent directory for normal or parallel
+case "$PWD" in
+    processor*) caseDir=".." ;;
+    *)          caseDir="."  ;;
+esac
+
+# check that case directory is writeable
+[ -w $caseDir ] || {
+    echo "$Script : $caseDir is not writeable"
+    exit 1
+}
+
+# check that controlDict is writeable
+controlDict=$caseDir/system/controlDict
+[ -w $controlDict ] || {
+    echo "$Script : $controlDict is not writeable"
+    exit 1
+}
+
+# need a pid unless with the -clear option
+if [ "$clearOpt" = true ]
+then
+    [ $# -eq 0 ] || usage
+else
+    [ $# -eq 1 ] || usage
+    PID=$1
+fi
 
 
 #-------------------------------------------------------------------------------
@@ -54,7 +140,7 @@ getNumberedLine() {
 # getLine dictionary entry
 # Prints dictionary entry line (without lineno)
 getLine() {
-    getNumberedLine $1 "$2" | sed -e 's/^[^:]*://' 
+    getNumberedLine $1 "$2" | sed -e 's/^[^:]*://'
 }
 
 # getRawEntry dictionary entry
@@ -66,7 +152,7 @@ getRawEntry() {
 # getEntry dictionary entry
 # Like getRawEntry but strips " and ending ';'
 getEntry() {
-    getRawEntry $1 "$2" | sed -e 's/^"//'  -e 's/;$//' -e 's/"$//' 
+    getRawEntry $1 "$2" | sed -e 's/^"//'  -e 's/;$//' -e 's/"$//'
 }
 
 # getKey entryLine
@@ -77,13 +163,14 @@ getKey() {
 
 
 # setRawEntry dictionary entry newValue
-# Replaces value of entry 
+# Replaces value of entry
 setRawEntry() {
     oldNumLine=`getNumberedLine $1 "$2"`
     lineNo=`echo "$oldNumLine" | sed -e 's/:.*//'`
     oldLine=`echo "$oldNumLine" | sed -e 's/^[^:]*://'`
     oldKey=`getKey "$oldLine"`
     oldVal=`getRawEntry $1 "$2"`
+
     if [ ! "$oldKey" -o ! "$oldVal" -o ! "$oldLine" ]
     then
         echo "setRawStringEntry: entry $2 not found in $1"
@@ -92,6 +179,7 @@ setRawEntry() {
         echo "oldLine=$oldLine"
         exit 1
     fi
+
     #echo "oldKey=$oldKey"
     #echo "lineNo=$lineNo"
     #echo "oldLine=$oldLine"
@@ -108,76 +196,30 @@ getBoolEntry()
 {
     val=`getEntry $1 $2`
     case "$val" in
-      'yes')
-        return 0
-        ;;
-      'no')
-        return 123
-        ;;
-      'true')
+    y | yes | true | on | 1)
         return 0
         ;;
-      'false')
+    n | no | false | off | 0)
         return 123
         ;;
-      1)
-        return 0
-        ;;
-      0)
-        return 123
-        ;;
-      *)
-        echo "$PROGNAME : getBoolEntry : Illegal boolean value $val in dictionary $1"
+    *)
+        echo "$Script : getBoolEntry : Illegal boolean value $val in dictionary $1"
         exit 1
         ;;
     esac
 }
 
-# newerFile file1 file2
-# ... could also use   if [ $file1 -nt $file2 ] ...
-newerFile()
-{
-    latest=`ls -1 -t $1 $2 2> /dev/null | head -1`
-    if [ "$latest" = $1 ]
-    then
-        return 0
-    else
-        return 1
-    fi
-}
-
 # processExists pid
 # Returns true if pid exists.
 processExists() {
-    ps -u $LOGNAME -o 'pid' | fgrep $1 >/dev/null
-}
-
-usage() {
-cat << USAGE
-Usage: $PROGNAME [-n] <root> <case> <pid>
-          or
-       $PROGNAME -c <root> <case>
-
-Tries to end running Foam application at next write or at next time
-step (-n (at your option). It needs runTimeModifiable switched on in the
-controlDict. It changes stopAt in the controlDict and waits for the job to
-finish. Restores original controlDict if
-    - job has finished
-    - controlDict gets modified (by user)
-    - $PROGNAME gets killed.
-
-The -c option clears any outstanding $PROGNAME for the case.
-
-USAGE
-    exit 1
+    ps -u $LOGNAME -o pid | fgrep $1 >/dev/null
 }
 
-
 # Restore controlDict and clean up
 restoreDict() {
-    trap 2 3 15
+    trap QUIT TERM INT
 
-    echo "$PROGNAME : Restoring controlDict from controlDict_bak."
+    echo "$Script : Restoring controlDict from controlDict_bak"
     if [ -r ${controlDict}_bak ]
     then
         cp ${controlDict}_bak $controlDict
@@ -185,7 +227,7 @@ restoreDict() {
 
     rm -f $pidFile
 
-    echo "$PROGNAME : Exiting."
+    echo "$Script : Exiting"
     exit 0
 }
 
@@ -196,105 +238,51 @@ restoreDict() {
 #
 #-------------------------------------------------------------------------------
 
-ARCH=`uname -s`
-
 #-- Force standards behaving ps
 #   Get info on all $USER processes
-case $ARCH in
-  HP-UX*)
-    UNIX95=a; export UNIX95
+case `uname -s` in
+HP-UX*)
+    UNIX95=a
+    export UNIX95
     ;;
-  IRIX*)
-    _XPG=1; export _XPG
+IRIX*)
+    _XPG=1
+    export _XPG
     ;;
 esac
 
 
-#
-# Initial checks
-#
-if [ $# -lt 3 ]
-then
-    usage
-fi
-
-STOPNOW=''
-if [ $1 = '-n' ]
-then
-    STOPNOW='yes'
-    shift
-fi
-CLEAR=''
-if [ $1 = '-c' ]
-then
-    CLEAR='yes'
-    shift
-    if [ $# -ne 2 ]
-    then
-        usage
-    fi
-    ROOT=$1
-    CASE=$2
-else
-    if [ $# -ne 3 ]
-    then
-        usage
-    fi
-    ROOT=$1
-    CASE=$2
-    PID=$3
-fi
-CASE=`echo $CASE | sed -e 's!/.*!!'`       # strip of processorXXX ending
-
-#- Pid actually running
-if [ ! "$CLEAR" ]
+# Pid actually running
+if [ "$clearOpt" != true ]
 then
     processExists $PID
     if [ $? -ne 0 ]
     then
-        echo "$PROGNAME : process $PID not running."
+        echo "$Script : process $PID not running"
         exit 1
     fi
 fi
 
-#- case directory writeable
-if [ ! -w $ROOT/$CASE ]
-then
-    echo "$PROGNAME : $ROOT/$CASE is not writeable."
-    exit 1
-fi
-
-#- Controldict writeable
-controlDict=$ROOT/$CASE/system/controlDict
-if [ ! -w  $controlDict ]
-then
-    echo "$PROGNAME : $controlDict is not writeable."
-    exit 1
-fi
-
 #- runTimeModifiable
-getBoolEntry $controlDict 'runTimeModifiable'
-if [ $? -ne 0 ]
-then
-    echo "$PROGNAME : runTimeModifiable not true in dictionary $controlDict."
+getBoolEntry $controlDict runTimeModifiable || {
+    echo "$Script : runTimeModifiable not true in dictionary $controlDict"
     exit 1
-fi
+}
 
 #
 #- Check if another foamEndJob running
 #
-if [ "$CLEAR" ]
+if [ "$clear" = true ]
 then
-    pidFiles=`ls $ROOT/$CASE/.foamEndJob* 2>/dev/null`
+    pidFiles=`ls $caseDir/.foamEndJob* 2>/dev/null`
     for pidFile in $pidFiles
     do
         pid=`cat $pidFile`
         if [ "$pid" ]
         then
-            echo "$PROGNAME : found $PROGNAME (pid $pid) for Foam process"
-            echo "  root: $ROOT"
-            echo "  case: $CASE"
-            echo "$PROGNAME : Killing $PROGNAME (pid $pid)."
+            echo "$Script : found $Script (pid $pid) for OpenFOAM process"
+            echo "  case: $PWD/$caseDir"
+            echo "$Script : Killing $Script (pid $pid)"
             kill $pid
             rm -f $pidFile
         fi
@@ -302,7 +290,7 @@ then
     exit 0
 fi
 
-pidFile=$ROOT/$CASE/.foamEndJob${PID}
+pidFile=$caseDir/.foamEndJob$PID
 if [ -f $pidFile ]
 then
     pid=`cat $pidFile`
@@ -311,12 +299,11 @@ then
         processExists $pid
         if [ $? -eq 0 ]
         then
-            echo "$PROGNAME : found running $PROGNAME (pid $pid) for Foam process"
-            echo "  root: $ROOT"
-            echo "  case: $CASE"
+            echo "$Script : found running $Script (pid $pid) for OpenFOAM process"
+            echo "  case: $PWD/$caseDir"
             echo "  pid : $PID"
             echo "  lock: $pidFile"
-            echo "Remove the lock if this is not the case."
+            echo "Remove the lock if this is not the case"
             exit 1
         fi
     fi
@@ -331,63 +318,60 @@ echo $$ > $pidFile
 
 
 #- startTime
-startTime=`getEntry $controlDict 'startTime'`
-if [ ! "$startTime" ]
-then
-    echo "$PROGNAME : startTime not set in dictionary $controlDict."
+startTime=`getEntry $controlDict startTime`
+[ "$startTime" ] || {
+    echo "$Script : startTime not set in dictionary $controlDict"
     exit 1
-fi
+}
 
 #- Write interval
-writeInterval=`getEntry $controlDict 'writeInterval'`
-if [ ! "$writeInterval" ]
-then
-    echo "$PROGNAME : writeInterval not set in dictionary $controlDict."
+writeInterval=`getEntry $controlDict writeInterval`
+[ "$writeInterval" ] || {
+    echo "$Script : writeInterval not set in dictionary $controlDict"
     exit 1
-fi
+}
 
 #- stopAt
-stopAt=`getEntry $controlDict 'stopAt'`
-if [ ! "$stopAt" ]
-then
-    echo "$PROGNAME : stopAt not set in dictionary $controlDict."
+stopAt=`getEntry $controlDict stopAt`
+[ "$stopAt" ] || {
+    echo "$Script : stopAt not set in dictionary $controlDict"
     exit 1
-fi
+}
 
 #- endTime
-endTime=`getEntry $controlDict 'endTime'`
-if [ ! "$endTime" ]
-then
-    echo "$PROGNAME : endTime not set in dictionary $controlDict."
+endTime=`getEntry $controlDict endTime`
+[ "$endTime" ] || {
+    echo "$Script : endTime not set in dictionary $controlDict"
     exit 1
-fi
+}
 
 
-echo "$PROGNAME : Read from controlDict:"
+echo "$Script : Read from controlDict:"
 echo "  controlDict   : $controlDict"
 echo "  writeInterval : $writeInterval"
 #echo "  startTime     : $startTime"
 echo "  stopAt        : $stopAt"
 #echo "  endTime       : $endTime"
 
-echo "$PROGNAME : Making backup of controlDict to controlDict_bak"
+echo "$Script : Making backup of controlDict to controlDict_bak"
 cp $controlDict ${controlDict}_bak
+
 #- Set up handler to restore controlDict
-trap restoreDict 2 3 15
+trap restoreDict QUIT TERM INT
 
-if [ "$STOPNOW" ]
+if [ "$stopOpt" = now ]
 then
-    setRawEntry  $controlDict 'stopAt' 'nextWrite'
-    setRawEntry  $controlDict 'writeInterval' '1'
+    setRawEntry  $controlDict stopAt nextWrite
+    setRawEntry  $controlDict writeInterval 1
 
-    echo "$PROGNAME : Changed in controlDict:"
-    echo "    `getLine $controlDict 'stopAt'`"
-    echo "    `getLine $controlDict 'writeInterval'`"
+    echo "$Script : Changed in controlDict:"
+    echo "    `getLine $controlDict stopAt`"
+    echo "    `getLine $controlDict writeInterval`"
 else
-    setRawEntry $controlDict 'stopAt' 'nextWrite'
+    setRawEntry $controlDict stopAt nextWrite
 
-    echo "$PROGNAME : Changed in controlDict:"
-    echo "    `getLine $controlDict 'stopAt'`"
+    echo "$Script : Changed in controlDict:"
+    echo "    `getLine $controlDict stopAt`"
 fi
 
 
@@ -401,23 +385,24 @@ sleep 5
 touch ${controlDict}_bak
 
 #- Loop a while to give NFS time to update
-if newerFile ${controlDict} ${controlDict}_bak; then
-    echo "$PROGNAME : controlDict newer than controlDict_bak."
-    echo "$PROGNAME : Waiting for file dates to get updated."
+if [ ${controlDict} -nt ${controlDict}_bak ]
+then
+    echo "$Script : controlDict newer than controlDict_bak"
+    echo "$Script : Waiting for file dates to get updated"
 
     iter=0
-    while newerFile ${controlDict} ${controlDict}_bak
+    while [ ${controlDict} -nt ${controlDict}_bak ]
     do
         if [ $iter -ge 120 ]
         then
             #- 120*5 sec = 10 mins passed. Give up
-            echo "$PROGNAME : File date not yet ok after 10 mins. Giving up."
+            echo "$Script : File date not yet ok after 10 mins ... giving up"
             break
         fi
         #- Give _bak a later time
         touch ${controlDict}_bak
 
-        #- Give nfs some time to update time on controlDict.
+        #- Give NFS a chance to update time on controlDict.
         sleep 5
 
         iter=`expr $iter + 1`
@@ -430,21 +415,20 @@ fi
 #  - controlDict modified. No restore.
 #  - controlDict_bak removed. No restore.
 
-echo "$PROGNAME : Waiting for Foam job $PID to finish ..."
+echo "$Script : Waiting for OpenFOAM job $PID to finish ..."
 
 while true
 do
     sleep 5
 
-    if [ ! -r ${controlDict}_bak ]
-    then
-        echo "$PROGNAME : ${controlDict}_bak dissappeared. Exiting without restore."
+    [ -r ${controlDict}_bak ] || {
+        echo "$Script : ${controlDict}_bak disappeared. Exiting without restore"
         exit 1
-    fi
+    }
 
-    if newerFile ${controlDict} ${controlDict}_bak
+    if [ ${controlDict} -nt ${controlDict}_bak ]
     then
-        echo "$PROGNAME : ${controlDict} modified externally. Exiting without restore."
+        echo "$Script : ${controlDict} modified externally. Exiting without restore"
         exit 0
     fi
 
@@ -454,7 +438,7 @@ do
         #- Job finished
         break
     fi
-    # echo "Foam job $PID still running ..."
+    # echo "OpenFOAM job $PID still running ..."
 done
 
 #- Dictionary restore
diff --git a/bin/foamLog b/bin/foamLog
index a5d2ecf254eb08a5b4887bea9b8e048a86c937be..e0e316784dc26eee4afaca03f4cdf5d0ca9f3866 100755
--- a/bin/foamLog
+++ b/bin/foamLog
@@ -31,35 +31,36 @@
 # Bugs
 #     -solution singularity not handled
 #------------------------------------------------------------------------------
+Script=${0##*/}
+toolsDir=${0%/*}/tools
 
-PROGDIR=`dirname $0`
-PROGNAME=`basename $0`
-DBFILE=${PROGNAME}.db
+usage() {
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    cat <<USAGE
 
-printUsage() {
-cat <<USAGE
-$PROGNAME - extracts xy files from OpenFOAM logs.
+Usage: $Script [OPTIONS] <log>
+  -list             lists but does not extract
+  -n                create single column files with the extracted data only
+  -quiet            quiet operation
+  -help             print the usage
 
-Usage: $PROGNAME [-n][-s] <log>
-           extracts xy files from log
-       $PROGNAME -l <log>
-           lists but does not extract
-       $PROGNAME -h
-           for a help message
+$Script - extracts xy files from OpenFOAM logs.
 
 USAGE
+    exit 1
 }
 
+#------------------------------------------------------------------------------
 
 printHelp() {
-printUsage
-cat <<LABHELP
+cat <<HELP
+-----------------------------------------------------------------------------
 The default is to extract for all the 'Solved for' variables the initial
 residual, the final residual and the number of iterations. Additionally, a
 (user editable) database is used to extract data for standard non-solved for
 variables like Courant number, and execution time.
 
-$PROGNAME -l lists all the possible variables without extracting them.
+$Script -l lists all the possible variables without extracting them.
 
 The program will generate and run an awk script which writes a set of files,
 logs/<var>_<subIter>, for every <var> specified, for every occurrence inside
@@ -79,7 +80,7 @@ separated with '/' :
   Column 2 is the extended regular expression (egrep) to select the line.
   Column 3 is the string (fgrep) to select the column inside the line.
 The value taken will be the first (non-space)word after this column.
-The database ($PROGNAME.db) will taken from these locations:
+The database ($Script.db) will taken from these locations:
 
     .
     $HOME/.OpenFOAM/$WM_PROJECT_VERSION
@@ -87,61 +88,97 @@ The database ($PROGNAME.db) will taken from these locations:
     $WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION
     $WM_PROJECT_INST_DIR/site
     $WM_PROJECT_DIR/etc
-    $PROGDIR/tools
+    $toolsDir
 
-Option -s suppresses the default information and only prints the extracted
+Option -q suppresses the default information and only prints the extracted
 variables.
+-----------------------------------------------------------------------------
+HELP
 
-LABHELP
+usage
 }
 
 
-# The various places to be searched:
-for i in \
-    . \
-    $HOME/.OpenFOAM/$WM_PROJECT_VERSION \
-    $HOME/.OpenFOAM \
-    $WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION \
-    $WM_PROJECT_INST_DIR/site \
-    $WM_PROJECT_DIR/etc \
-    $PROGDIR/tools \
-    ;
+timeName=Time
+unset listOpt quietOpt
+
+# parse options
+while [ "$#" -gt 0 ]
 do
-    if [ -r $i/$DBFILE ]
-    then
-        DBFILE="$i/$DBFILE"
+    case "$1" in
+    -h | -help)
+        printHelp
+        exit 0
+        ;;
+    -n)
+        unset timeName
+        shift
+        ;;
+    -l | -list)
+        listOpt=true
+        shift
+        ;;
+    -q | -quiet | -s | -silent)
+        quietOpt=true
+        shift
+        ;;
+    -*)
+        usage "unknown option: '$*'"
+        ;;
+    *)
         break
-    fi
+        ;;
+    esac
 done
 
+# find the database file
+DBFILE=$Script.db
+[ -f $DBFILE ] || DBFILE=`foamEtcFile $Script.db` || DBFILE=$toolsDir/$Script.db
 
-myEcho() {
-  if [ "$VERBOSE" ]
-  then
-      echo "$*"
-  fi
+# need the database file
+[ -f $DBFILE ] || {
+    echo "$Script: Cannot read database $DBFILE"
+    exit 1
 }
 
+# single logFile
+if [ $# -eq 1 ]
+then
+    LOG=$1
+    [ -r "$LOG" ] && [ -f "$LOG" ] || usage "Cannot read log $LOG"
+else
+    usage
+fi
+
+
+myEcho()
+{
+   [ "$quietOpt" = true ] || echo "$*"
+}
+
+
 # getSolvedVars logFile
 # Prints names of all 'solved for' variables in the log file.
-getSolvedVars() {
+getSolvedVars()
+{
     fgrep ' Solving for ' $1 | fgrep ',' | sed -e 's/.* Solving for \([^,]*\)[,:].*/\1/' | sort -u
 }
 
 
 # getQueries dbFile queryName
 # Gets regular expressions for a certain queryName from the database
-getQueries() {
-    if [ ! -f "$1" ]
-    then
-        echo "Cannot find dbFile $1"
-        exit 1
-    fi
-
+getQueries()
+{
+    dbFile=$1
     queryName=$2
 
-    LINEQ=`grep -v '^#' $1 | awk -F '/' "/$queryName/ {if (\"$queryName\" "'!= $1) next; print $2}'`
-    NUMQ=`grep -v '^#' $1 | awk -F '/' "/$queryName/ {if (\"$queryName\" "'!= $1) next; print $3}'`
+    [ -f "$dbFile" ] || {
+        echo "Cannot find dbFile $dbFile"
+        exit 1
+    }
+
+    LINEQ=`grep -v '^#' $dbFile | awk -F '/' "/$queryName/ {if (\"$queryName\" "'!= $1) next; print $2}'`
+    NUMQ=`grep -v '^#' $dbFile | awk -F '/' "/$queryName/ {if (\"$queryName\" "'!= $1) next; print $3}'`
 
     #echo "For $queryName found line selection /$LINEQ/ , column selection /$NUMQ/" 1>&2
     #if [ ! "$LINEQ" -o ! "$NUMQ" ]
@@ -153,14 +190,16 @@ getQueries() {
 
 # getDbQueryList dbFile
 # Echoes list of possible queries
-getDbQueryList() {
+getDbQueryList()
+{
     grep -v '^#' $1 | grep '[^ \t]' | awk -F '/' '{print $1}'
 }
 
 
 # getSolveQueryList logFile
 # Echoes list of queries from "solved for" variables in log file
-getSolveQueryList() {
+getSolveQueryList()
+{
     solvedVars=`getSolvedVars $1`
 
     for var in $solvedVars
@@ -174,7 +213,8 @@ getSolveQueryList() {
 
 # getAllQueries dbFile logFile
 # Gets all queries from database and from logfile
-getAllQueries() {
+getAllQueries()
+{
     #-- All solved for queries from log file
     queries=`getSolveQueryList $2`
 
@@ -208,107 +248,33 @@ getAllQueries() {
 # Main
 #-----------------------------
 
-# sort arguments
-TIMENAME='Time'
-VERBOSE='yes'
-LISTONLY=''
-
-while getopts nslh flags
-do
-    case $flags in
-    n)
-        TIMENAME=""
-        ;;
-    h)
-        printHelp
-        exit 0
-        ;;
-    s)
-        VERBOSE=""
-        ;;
-    l)
-        LISTONLY='yes'
-        ;;
-    \?)
-        printUsage
-        exit 1
-        ;;
-    esac
-done
-
-
-# Shift options
-shift `expr $OPTIND - 1`
-
-if [ ! -f $DBFILE ]
+if [ "$listOpt" = true ]
 then
-    echo "$PROGNAME: Cannot read database $DBFILE"
-    exit 1
-fi
-
-if [ "$LISTONLY" ]
-then
-    if [ $# -ne 1 ]
-    then
-        printUsage
-        exit 1
-    fi
-    LOG=$1;
-    if [ ! -r $LOG ]
-    then
-        echo "$PROGNAME: Cannot read log $LOG"
-        exit 1
-    fi
     getAllQueries $DBFILE $LOG
     exit 0
 fi
 
-if [ $# -ne 1 ]
-then
-    printUsage
-    exit 1
-fi
+caseDir=.
+outputDir=$caseDir/logs
 
-CASEDIR=.
-LOG=$1
-if [ ! -r $LOG ]
-then
-    echo "$PROGNAME: Cannot read log $LOG"
+[ -d "$caseDir" ] || {
+    echo "$Script: Cannot read $caseDir"
     exit 1
-fi
+}
 
 QUERYNAMES=`getAllQueries $DBFILE $LOG`
 
-
-if [ ! "$CASEDIR" ]
-then
-    printUsage
-    exit 1
-fi
-
-if [ ! -d "$CASEDIR" ]
-then
-    echo "$PROGNAME: Cannot read $CASEDIR"
-    exit 1
-fi
-
-if [ ! -f "$LOG" ]
-then
-    echo "$PROGNAME: Cannot read log file $LOG"
-    exit 1
-fi
-
-
-#-- Make logs dir in case directory and put awk file there.
-
-mkdir -p $CASEDIR/logs
-AWKFILE=$CASEDIR/logs/$PROGNAME.awk
+#
+# Make logs dir in case directory and place awk file there
+#
+mkdir -p $outputDir
+AWKFILE=$outputDir/$Script.awk
 
 myEcho "Using:"
 myEcho "  log      : $LOG"
 myEcho "  database : $DBFILE"
 myEcho "  awk file : $AWKFILE"
-myEcho "  files to : $CASEDIR/logs"
+myEcho "  files to : $outputDir"
 myEcho ""
 
 
@@ -316,22 +282,25 @@ myEcho ""
 # Generate Awk program
 #-----------------------------
 
-#-- header
+rm -f $AWKFILE 2> /dev/null
+cat << AWK_CONTENTS > $AWKFILE
+# header
+BEGIN {
+    Iteration=0
+    resetCounters()
+}
 
-rm -f $AWKFILE; touch $AWKFILE
-echo "BEGIN {" >> $AWKFILE
-echo "    Iteration=0" >> $AWKFILE
-echo "    resetCounters()" >> $AWKFILE
-echo "}" >> $AWKFILE
+# reset counters used for variable postfix
+function resetCounters() {
+AWK_CONTENTS
+# ----------
 
-echo "" >> $AWKFILE
-echo "# reset counters used for variable postfix" >> $AWKFILE
-echo "function resetCounters() {" >> $AWKFILE
 for queryName in $QUERYNAMES
 do
     varName=${queryName}Cnt
     echo "    ${varName}=0" >> $AWKFILE
 done
+
 echo "    # Reset counters for general Solving for extraction" >> $AWKFILE
 echo "    for (varName in subIter)" >> $AWKFILE
 echo "    {" >> $AWKFILE
@@ -341,10 +310,9 @@ echo "}" >> $AWKFILE
 echo "" >> $AWKFILE
 
 
-cat <<LABEL >> $AWKFILE
+cat << AWK_CONTENTS >> $AWKFILE
 # Extract value after columnSel
-function extract(inLine,columnSel,outVar,
-                 a,b)
+function extract(inLine,columnSel,outVar,a,b)
 {
     a=index(inLine, columnSel)
     b=length(columnSel)
@@ -352,71 +320,82 @@ function extract(inLine,columnSel,outVar,
     gsub("[,:]","",outVar[1])
 }
 
-LABEL
-
+AWK_CONTENTS
+# ----------
 
-#-- Generate code for iteration separator (increments 'Iteration')
+#
+# Code for iteration separator (increments 'Iteration')
+#
 getQueries $DBFILE 'Separator'
-cat <<LABSEP >> $AWKFILE
-#-- Iteration separator (increments 'Iteration')
+cat << AWK_CONTENTS >> $AWKFILE
+# Iteration separator (increments 'Iteration')
 /$LINEQ/ {
     Iteration++
     resetCounters()
 }
 
-LABSEP
-
+AWK_CONTENTS
+# ----------
 
-#-- Generate code for extracting Time
+#
+# Code for extracting Time
+#
 getQueries $DBFILE 'Time'
-cat <<LABTIME >> $AWKFILE
-#-- Time extraction (sets 'Time')
+cat << AWK_CONTENTS >> $AWKFILE
+# Time extraction (sets 'Time')
 /$LINEQ/ {
     extract(\$0, "$NUMQ", val)
     Time=val[1]
 }
 
-LABTIME
-
+AWK_CONTENTS
+# ----------
 
-#-- Generate code for singularity handling.
-cat <<LABSING >> $AWKFILE
-#-- Skip whole line with singularity variable
+#
+# Code for singularity handling.
+#
+cat << AWK_CONTENTS >> $AWKFILE
+# Skip whole line with singularity variable
 /solution singularity/ {
     next;
 }
-LABSING
 
+AWK_CONTENTS
+# ----------
 
-#-- Generate code for extracting solved for quantities
-cat <<LABSOLVE >> $AWKFILE
-#-- Extraction of any solved for variable
+#
+# Code for extracting solved for quantities
+#
+cat << AWK_CONTENTS >> $AWKFILE
+# Extraction of any solved for variable
 /Solving for/ {
     extract(\$0, "Solving for ", varNameVal)
 
     varName=varNameVal[1]
     file=varName "_" subIter[varName]++
-    file="$CASEDIR/logs/" file
+    file="$outputDir/" file
     extract(\$0, "Initial residual = ", val)
-    print $TIMENAME "\t" val[1] > file
+    print $timeName "\t" val[1] > file
 
     varName=varNameVal[1] "FinalRes"
     file=varName "_" subIter[varName]++
-    file="$CASEDIR/logs/" file
+    file="$outputDir/" file
     extract(\$0, "Final residual = ", val)
-    print $TIMENAME "\t" val[1] > file
+    print $timeName "\t" val[1] > file
 
     varName=varNameVal[1] "Iters"
     file=varName "_" subIter[varName]++
-    file="$CASEDIR/logs/" file
+    file="$outputDir/" file
     extract(\$0, "No Iterations ", val)
-    print $TIMENAME "\t" val[1] > file
+    print $timeName "\t" val[1] > file
 }
 
-LABSOLVE
+AWK_CONTENTS
+# ----------
 
-
-#-- generate code to process queries
+#
+# Code to process queries
+#
 for queryName in $QUERYNAMES
 do
     getQueries $DBFILE $queryName
@@ -424,11 +403,11 @@ do
     then
         counter=${queryName}Cnt
 
-        echo "#-- Extraction of $queryName" >> $AWKFILE
+        echo "# Extraction of $queryName" >> $AWKFILE
         echo "/$LINEQ/ {" >> $AWKFILE
         echo "    extract(\$0, \"$NUMQ\", val)" >> $AWKFILE
-        echo "    file=\"$CASEDIR/logs/${queryName}_\" ${counter}" >> $AWKFILE
-        echo "    print $TIMENAME \"\\t\" val[1] > file" >> $AWKFILE
+        echo "    file=\"$outputDir/${queryName}_\" ${counter}" >> $AWKFILE
+        echo "    print $timeName \"\\t\" val[1] > file" >> $AWKFILE
         echo "    ${counter}++" >> $AWKFILE
         echo "}" >> $AWKFILE
         echo "" >> $AWKFILE
diff --git a/bin/foamUpdateCaseFileHeader b/bin/foamUpdateCaseFileHeader
index c6fc291487655d473869f83bc527beb434ed410c..af9cafd6491a6eaceadfc854e578367e02359859 100755
--- a/bin/foamUpdateCaseFileHeader
+++ b/bin/foamUpdateCaseFileHeader
@@ -32,41 +32,70 @@
 #     Also removes consecutive blank lines from file.
 #
 #------------------------------------------------------------------------------
-foamVersion=$WM_PROJECT_VERSION
-
 usage() {
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
 
 Usage: ${0##*/} [OPTION] <file1> ... <fileN>
 
 options:
-  -v VER  specifies the version to be written in the header
-  -h      help
+  -version <ver>    specifies the version to be written in the header
+  -help             print the usage
 
   Updates the header of application files and removes consecutive blank lines.
   By default, writes current OpenFOAM version in the header.
-  An alternative version can be specified with the -v option.
+  An alternative version can be specified with the -version option.
 
 USAGE
     exit 1
 }
 
+#------------------------------------------------------------------------------
 
-printHeader() {
+# parse options
+while [ "$#" -gt 0 ]
+do
+    case "$1" in
+    -h | -help)
+        usage
+        ;;
+    -v | -version)
+        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
+        version="$2"
+        shift 2
+        ;;
+    -*)
+        usage "unknown option: '$*'"
+        ;;
+    *)
+        break
+        ;;
+    esac
+done
+
+# constant width for version - default to WM_PROJECT_VERSION
+version=$(printf %-36s ${version:-$WM_PROJECT_VERSION})
+
+[ $# -ge 1 ] || usage
+
+#------------------------------------------------------------------------------
+
+printHeader()
+{
     cat<<HEADER
 /*--------------------------------*- C++ -*----------------------------------*\\
 | =========                 |                                                 |
 | \\\\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\\\    /   O peration     | Version:  ${foamVersion}  |
+|  \\\\    /   O peration     | Version:  $version  |
 |   \\\\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\\\/     M anipulation  |                                                 |
 \\*---------------------------------------------------------------------------*/
 FoamFile
 {
     version     2.0;
-    format      ${1};
-    class       ${2};
-    object      ${3};
+    format      $1;
+    class       $2;
+    object      $3;
 }
 HEADER
 }
@@ -75,68 +104,40 @@ HEADER
 #
 # extract attribute '$1' from file '$2'
 #
-FoamFileAttribute() {
+FoamFileAttribute()
+{
     sed -n -e 's/[ ;]*$//' -e "s/^ *$1 *//p" $2
 }
 
 
 #
-# OPTIONS
-#
-opts=$(getopt hv: $*)
-if [ $? -ne 0 ]
-then
-    echo "Aborting due to invalid option"
-    usage
-fi
-eval set -- '$opts'
-while [ "$1" != "--" ]
-do
-    case $1 in
-    -v)
-        foamVersion=$2
-        shift
-        ;;
-    -h)
-        usage
-        ;;
-    esac
-    shift
-done
-shift
-
-[ $# -ge 1 ] || usage
-
-
-# constant width for version
-foamVersion=$(printf %-36s $foamVersion)
-
-#
-# MAIN
+# main
 #
-unset NOTE
 
+tmpFile=FoamFile.tmp$$
 for caseFile
 do
     if grep FoamFile $caseFile >/dev/null 2>&1
     then
         echo "Updating case file: $caseFile"
-        sed -n '/FoamFile/,/}/p' $caseFile > FoamFile.tmp
+        sed -n '/FoamFile/,/}/p' $caseFile > $tmpFile
 
-        FORMAT=$(FoamFileAttribute format FoamFile.tmp)
-        CLASS=$(FoamFileAttribute  class  FoamFile.tmp)
-        OBJECT=$(FoamFileAttribute object FoamFile.tmp)
-        # extract NOTE?
+        format=$(FoamFileAttribute format $tmpFile)
+        class=$(FoamFileAttribute  class  $tmpFile)
+        object=$(FoamFileAttribute object $tmpFile)
+        # extract note? - needs special handling
+        unset note
 
-        printHeader $FORMAT $CLASS $OBJECT $NOTE > FoamFile.tmp
-        sed '1,/}/d' $caseFile | sed '/./,/^$/!d' >> FoamFile.tmp
+        printHeader $format $class $object "$note" > $tmpFile
+
+        sed '1,/}/d' $caseFile | sed '/./,/^$/!d' >> $tmpFile
 
         # use cat to avoid removing/replace soft-links
-        [ -s FoamFile.tmp ] && cat FoamFile.tmp >| $caseFile
-        rm -f FoamFile.tmp 2>/dev/null
+        [ -s $tmpFile ] && cat $tmpFile >| $caseFile
+        rm -f $tmpFile 2>/dev/null
     else
         echo " Invalid case file: $caseFile" 1>&2
     fi
 done
 
-#------------------------------------------------------------------------------
+#------------------------------------------------------------------ end-of-file
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
index 2e70a2c4f8ad8117112601a455affaa36499cdd0..0efe82bed6a3af0598a398cf4da4928a623e5e6a 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,7 +101,7 @@ public:
         explicit inline DynamicList(const label);
 
         //- Construct copy.
-        explicit inline DynamicList
+        inline DynamicList
         (
             const DynamicList<T, SizeInc, SizeMult, SizeDiv>&
         );
@@ -116,7 +116,7 @@ public:
         //- Construct by transferring the parameter contents
         explicit inline DynamicList(const Xfer<List<T> >&);
 
-        //- Construct from Istream. Size set to size of read list.
+        //- Construct from Istream. Size set to size of list read.
         explicit DynamicList(Istream&);
 
 
diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C
index 8e18dc786115461aa752148dfd340ca64ed90ddc..36bccb3911c0c4ae3725556ad5eef14e568972db 100644
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@@ -518,11 +518,28 @@ bool Foam::Time::loop()
 
     if (running)
     {
-        operator++();
+        if (!subCycling_)
+        {
+            readModifiedObjects();
+
+            if (timeIndex_ == startTimeIndex_)
+            {
+                functionObjects_.start();
+            }
+            else
+            {
+                functionObjects_.execute();
+            }
+        }
 
         // Check update the "running" status following the "++" operation
         // to take into account possible side-effects from functionObjects
         running = run();
+
+        if (running)
+        {
+            operator++();
+        }
     }
 
     return running;
@@ -667,20 +684,6 @@ Foam::Time& Foam::Time::operator+=(const scalar deltaT)
 
 Foam::Time& Foam::Time::operator++()
 {
-    if (!subCycling_)
-    {
-        readModifiedObjects();
-
-        if (timeIndex_ == startTimeIndex_)
-        {
-            functionObjects_.start();
-        }
-        else
-        {
-            functionObjects_.execute();
-        }
-    }
-
     deltaT0_ = deltaTSave_;
     deltaTSave_ = deltaT_;
 
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index fb567c113b69b1ba8479b4fad7345cedfaf9a0f9..b3937e4495370db5a7b17352b4460a188c00b98a 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -750,6 +750,20 @@ Foam::argList::~argList()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+void Foam::argList::printNotes() const
+{
+    // output notes directly - no automatic text wrapping
+    if (!notes.empty())
+    {
+        Info<< nl;
+        forAllConstIter(SLList<string>, notes, iter)
+        {
+            Info<< iter().c_str() << nl;
+        }
+    }
+}
+
+
 void Foam::argList::printUsage() const
 {
     Info<< "\nUsage: " << executable_ << " [OPTIONS]";
@@ -819,20 +833,7 @@ void Foam::argList::printUsage() const
     );
 
 
-    // output notes directly - no automatic text wrapping
-    if (!notes.empty())
-    {
-        Info<< nl;
-        for
-        (
-            SLList<string>::const_iterator iter = notes.begin();
-            iter != notes.end();
-            ++iter
-        )
-        {
-            Info<< iter().c_str() << nl;
-        }
-    }
+    printNotes();
 
     Info<< nl
         <<"Using OpenFOAM-" << Foam::FOAMversion
diff --git a/src/OpenFOAM/global/argList/argList.H b/src/OpenFOAM/global/argList/argList.H
index 3e9785ebe48c591f127bdaa18e453e7812a456a5..c36955d5ced42210f5407513d6e374c971daff4c 100644
--- a/src/OpenFOAM/global/argList/argList.H
+++ b/src/OpenFOAM/global/argList/argList.H
@@ -329,6 +329,9 @@ public:
 
         // Print
 
+            //- Print notes (if any)
+            void printNotes() const;
+
             //- Print usage
             void printUsage() const;
 
diff --git a/src/postProcessing/functionObjects/Allwmake b/src/postProcessing/functionObjects/Allwmake
index 980a308557a4498f50ff19b7721f07f2a7787ab9..d8cbe09eb9ef47957d37281e867d764d5d035e10 100755
--- a/src/postProcessing/functionObjects/Allwmake
+++ b/src/postProcessing/functionObjects/Allwmake
@@ -6,7 +6,7 @@ wmake libso field
 wmake libso forces
 wmake libso IO
 wmake libso utilities
-wmake libso residualControl
+wmake libso jobControl
 wmake libso systemCall
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C
index e9357407de3c1945cbd57ddebb568df9ca3d1751..12cb6d197d1980188697a145bef5fa2aac7570ba 100644
--- a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C
+++ b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C
@@ -29,10 +29,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(writeRegisteredObject, 0);
-}
+defineTypeNameAndDebug(Foam::writeRegisteredObject, 0);
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/controlDict b/src/postProcessing/functionObjects/field/fieldAverage/controlDict
index 3e186c89e28703360e1939b53039023ea506c2cf..70187fad00c76f1e87465ed9677acaca6b3be2ba 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/controlDict
+++ b/src/postProcessing/functionObjects/field/fieldAverage/controlDict
@@ -36,29 +36,29 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 functions
 {
     fieldAverage1
     {
         // Type of functionObject
-        type fieldAverage;
+        type            fieldAverage;
 
         // Where to load it from (if not already in solver)
         functionObjectLibs ("libfieldAverage.so");
 
         // Function object enabled flag
-        enabled         true;                             
+        enabled         true;
 
         // When to output the average fields
-        outputControl   outputTime;                       
+        outputControl   outputTime;
 
         // Fields to be averaged - runTime modifiable
         fields
diff --git a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C
index f23441d46755ee93f8888cfb942343d8882d9382..b013114ee754c077e05fd061baf6318986d5dd10 100644
--- a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C
+++ b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C
@@ -31,10 +31,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(fieldMinMax, 0);
-}
+defineTypeNameAndDebug(Foam::fieldMinMax, 0);
 
 
 template<>
diff --git a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C
index f72211985989a18d8424338b2d631bff34f4ce11..a741c4560c8cf9d0f1d01400f4defa598ff18304 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C
@@ -30,31 +30,27 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    namespace fieldValues
-    {
-        defineTypeNameAndDebug(cellSource, 0);
-    }
+defineTypeNameAndDebug(Foam::fieldValues::cellSource, 0);
 
-    template<>
-    const char* NamedEnum<fieldValues::cellSource::sourceType, 1>::
-        names[] = {"cellZone"};
+template<>
+const char* Foam::NamedEnum<Foam::fieldValues::cellSource::sourceType, 1>::
+names[] =
+{
+    "cellZone"
+};
 
-    const NamedEnum<fieldValues::cellSource::sourceType, 1>
-        fieldValues::cellSource::sourceTypeNames_;
+const Foam::NamedEnum<Foam::fieldValues::cellSource::sourceType, 1>
+    Foam::fieldValues::cellSource::sourceTypeNames_;
 
-    template<>
-    const char* NamedEnum<fieldValues::cellSource::operationType, 5>::
-        names[] =
-        {
-            "none", "sum", "volAverage", "volIntegrate", "weightedAverage"
-        };
-
-    const NamedEnum<fieldValues::cellSource::operationType, 5>
-        fieldValues::cellSource::operationTypeNames_;
+template<>
+const char* Foam::NamedEnum<Foam::fieldValues::cellSource::operationType, 5>::
+names[] =
+{
+    "none", "sum", "volAverage", "volIntegrate", "weightedAverage"
+};
 
-}
+const Foam::NamedEnum<Foam::fieldValues::cellSource::operationType, 5>
+    Foam::fieldValues::cellSource::operationTypeNames_;
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -238,4 +234,3 @@ void Foam::fieldValues::cellSource::write()
 
 
 // ************************************************************************* //
-
diff --git a/src/postProcessing/functionObjects/field/fieldValues/controlDict b/src/postProcessing/functionObjects/field/fieldValues/controlDict
index 7d9ab1f656552fac5a1d6c66add20f999c66190d..5971b3be0e1a0a4d513068b4f76a61ced2bdee48 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/controlDict
+++ b/src/postProcessing/functionObjects/field/fieldValues/controlDict
@@ -37,16 +37,16 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 functions
-(
+{
     faceObj1
     {
         type            faceSource;
@@ -60,6 +60,7 @@ functions
 //        source          faceZone;
 //        sourceName      f0;
         operation       areaAverage;
+
         fields
         (
             p
@@ -79,6 +80,7 @@ functions
         source          faceZone;
         sourceName      f0;
         operation       sum;
+
         fields
         (
             phi
@@ -96,13 +98,13 @@ functions
         source          cellZone;
         sourceName      c0;
         operation       volAverage;
+
         fields
         (
             p
             U
         );
     }
-);
-
+}
 
 // ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
index 219200ea707e0fac94a0195578ca16e619fbf776..ebcf487b7d8b920216d08c6657d451afe2ffdf3a 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
@@ -34,31 +34,27 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    namespace fieldValues
-    {
-        defineTypeNameAndDebug(faceSource, 0);
-    }
-
-    template<>
-    const char* NamedEnum<fieldValues::faceSource::sourceType, 2>::
-        names[] = {"faceZone", "patch"};
+defineTypeNameAndDebug(Foam::fieldValues::faceSource, 0);
 
-    const NamedEnum<fieldValues::faceSource::sourceType, 2>
-        fieldValues::faceSource::sourceTypeNames_;
+template<>
+const char* Foam::NamedEnum<Foam::fieldValues::faceSource::sourceType, 2>::
+names[] =
+{
+    "faceZone", "patch"
+};
 
-    template<>
-    const char* NamedEnum<fieldValues::faceSource::operationType, 5>::
-        names[] =
-        {
-            "none", "sum", "areaAverage", "areaIntegrate", "weightedAverage"
-        };
+const Foam::NamedEnum<Foam::fieldValues::faceSource::sourceType, 2>
+    Foam::fieldValues::faceSource::sourceTypeNames_;
 
-    const NamedEnum<fieldValues::faceSource::operationType, 5>
-        fieldValues::faceSource::operationTypeNames_;
+template<>
+const char* Foam::NamedEnum<Foam::fieldValues::faceSource::operationType, 5>::
+names[] =
+{
+    "none", "sum", "areaAverage", "areaIntegrate", "weightedAverage"
+};
 
-}
+const Foam::NamedEnum<Foam::fieldValues::faceSource::operationType, 5>
+    Foam::fieldValues::faceSource::operationTypeNames_;
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/field/readFields/postProcessingDict b/src/postProcessing/functionObjects/field/readFields/postProcessingDict
index aa304a259f9c89375ffbc1308181383b49db6bab..fbe59b234c848ccb6b426324cb03fdc53928fb5e 100644
--- a/src/postProcessing/functionObjects/field/readFields/postProcessingDict
+++ b/src/postProcessing/functionObjects/field/readFields/postProcessingDict
@@ -16,7 +16,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 functions
-(
+{
     readFields1
     {
         type            readFields;
@@ -24,11 +24,13 @@ functions
         enabled         true;
         outputControl   timeStep;
         outputInterval  1;
+
         fields
         (
             interpolateU
         );
     }
+
     faceObj2
     {
         type            faceSource;
@@ -41,12 +43,12 @@ functions
         source          faceZone;
         sourceName      f0;
         operation       areaAverage;
+
         fields
         (
             interpolateU
         );
     }
-);
-
+}
 
 // ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/field/readFields/readFields.C b/src/postProcessing/functionObjects/field/readFields/readFields.C
index 17b46f1a523f9e0e93df0a5c4d5b7cded5c01dc0..e4ae72660a0058656d8a7f1bf7c0ed507836b855 100644
--- a/src/postProcessing/functionObjects/field/readFields/readFields.C
+++ b/src/postProcessing/functionObjects/field/readFields/readFields.C
@@ -28,10 +28,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(readFields, 0);
-}
+defineTypeNameAndDebug(Foam::readFields, 0);
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C b/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C
index 1a2a101b377b8a02b51bbf87e3662d1b9ee7a9eb..9174e35781258d0d77655af67e77a73f389a3c18 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C
@@ -31,14 +31,17 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(streamLineParticle, 0);
+
     defineParticleTypeNameAndDebug(streamLineParticle, 0);
+
     defineTemplateTypeNameAndDebugWithName
     (
         IOField<vectorField>,
         "vectorFieldField",
         0
     );
-};
+}
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLineParticleCloud.C b/src/postProcessing/functionObjects/field/streamLine/streamLineParticleCloud.C
index 12278502d0b69591f859722d48fc143a23d4aafa..095b08ee42d0988c9a6e94aa1948be34ad5f2234 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLineParticleCloud.C
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLineParticleCloud.C
@@ -30,7 +30,7 @@ License
 namespace Foam
 {
     defineTemplateTypeNameAndDebug(Cloud<streamLineParticle>, 0);
-};
+}
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
diff --git a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
index 3b8ee51eae99d17e0cf2985c3aaca8159cd3e274..d7acd9ad4cf767932d8afce748715c599a57323f 100644
--- a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
+++ b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
@@ -30,10 +30,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(forceCoeffs, 0);
-}
+defineTypeNameAndDebug(Foam::forceCoeffs, 0);
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/forces/forces/forces.C b/src/postProcessing/functionObjects/forces/forces/forces.C
index c58ab692f12c5a90707765b27cad1713f603e685..844366eefba0ebb66b14c43c72b1418d8787c739 100644
--- a/src/postProcessing/functionObjects/forces/forces/forces.C
+++ b/src/postProcessing/functionObjects/forces/forces/forces.C
@@ -39,10 +39,8 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(forces, 0);
-}
+defineTypeNameAndDebug(Foam::forces, 0);
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.C
index d750bb3a7fa71df06e87b9e716ee4eea718c3895..becacd749c2064d133e7cb02c3d85925b422fe37 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.C
@@ -34,14 +34,15 @@ namespace Foam
 namespace sixDoFRigidBodyMotionConstraints
 {
     defineTypeNameAndDebug(fixedAxis, 0);
+
     addToRunTimeSelectionTable
     (
         sixDoFRigidBodyMotionConstraint,
         fixedAxis,
         dictionary
     );
-};
-};
+}
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.C
index 877706a16379b078b6068ebfe6ea4c06c8b2e630..b2e88aa657da8394006aa7607e4f86b29143e6d9 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.C
@@ -34,14 +34,15 @@ namespace Foam
 namespace sixDoFRigidBodyMotionConstraints
 {
     defineTypeNameAndDebug(fixedLine, 0);
+
     addToRunTimeSelectionTable
     (
         sixDoFRigidBodyMotionConstraint,
         fixedLine,
         dictionary
     );
-};
-};
+}
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.C
index ea5f0e54c2196809dc56e5ab179e69c5a5a846cf..6a6839b9bec69cda0030bc31cce17878b9a21dcd 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.C
@@ -34,14 +34,15 @@ namespace Foam
 namespace sixDoFRigidBodyMotionConstraints
 {
     defineTypeNameAndDebug(fixedOrientation, 0);
+
     addToRunTimeSelectionTable
     (
         sixDoFRigidBodyMotionConstraint,
         fixedOrientation,
         dictionary
     );
-};
-};
+}
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPlane/fixedPlane.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPlane/fixedPlane.C
index e8b4dcb61e0b89aa07c0666a9d0465548168cb1b..38544533ce056e100ab28f1b692293285496b365 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPlane/fixedPlane.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPlane/fixedPlane.C
@@ -34,14 +34,15 @@ namespace Foam
 namespace sixDoFRigidBodyMotionConstraints
 {
     defineTypeNameAndDebug(fixedPlane, 0);
+
     addToRunTimeSelectionTable
     (
         sixDoFRigidBodyMotionConstraint,
         fixedPlane,
         dictionary
     );
-};
-};
+}
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPoint/fixedPoint.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPoint/fixedPoint.C
index abe67667a9296687eed2de137408a68a62f75402..c1a35d85c001ea9f69e6cf4e89b8c21582d218f1 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPoint/fixedPoint.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPoint/fixedPoint.C
@@ -34,14 +34,15 @@ namespace Foam
 namespace sixDoFRigidBodyMotionConstraints
 {
     defineTypeNameAndDebug(fixedPoint, 0);
+
     addToRunTimeSelectionTable
     (
         sixDoFRigidBodyMotionConstraint,
         fixedPoint,
         dictionary
     );
-};
-};
+}
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C
index 14c364b3511f32b43236ce442e44de2b7d1999b9..704d48fe3e87f7b9d8f0e45d4de56453333f5a14 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C
@@ -35,14 +35,15 @@ namespace Foam
 namespace sixDoFRigidBodyMotionRestraints
 {
     defineTypeNameAndDebug(linearAxialAngularSpring, 0);
+
     addToRunTimeSelectionTable
     (
         sixDoFRigidBodyMotionRestraint,
         linearAxialAngularSpring,
         dictionary
     );
-};
-};
+}
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.C
index 5fb6dfc3fe91c8375bfd45b0f2bbe4015eb6f420..2a1edc1c55dca65ff30a4f25611fffca1c7d53a7 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.C
@@ -34,14 +34,15 @@ namespace Foam
 namespace sixDoFRigidBodyMotionRestraints
 {
     defineTypeNameAndDebug(linearSpring, 0);
+
     addToRunTimeSelectionTable
     (
         sixDoFRigidBodyMotionRestraint,
         linearSpring,
         dictionary
     );
-};
-};
+}
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sphericalAngularSpring/sphericalAngularSpring.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sphericalAngularSpring/sphericalAngularSpring.C
index 00953da36fdf556f447998b76be8b1d6bddcc3f5..df10f1e8efa6db935ea00782e56ea7029c4a0211 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sphericalAngularSpring/sphericalAngularSpring.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sphericalAngularSpring/sphericalAngularSpring.C
@@ -34,14 +34,15 @@ namespace Foam
 namespace sixDoFRigidBodyMotionRestraints
 {
     defineTypeNameAndDebug(sphericalAngularSpring, 0);
+
     addToRunTimeSelectionTable
     (
         sixDoFRigidBodyMotionRestraint,
         sphericalAngularSpring,
         dictionary
     );
-};
-};
+}
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
index b4022f987aa7be024c9e7cfc3ef42876336c3f29..285eb7ac106ae77de414221e8b62ece6a37a7a34 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
@@ -36,14 +36,15 @@ namespace Foam
 namespace sixDoFRigidBodyMotionRestraints
 {
     defineTypeNameAndDebug(tabulatedAxialAngularSpring, 0);
+
     addToRunTimeSelectionTable
     (
         sixDoFRigidBodyMotionRestraint,
         tabulatedAxialAngularSpring,
         dictionary
     );
-};
-};
+}
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/jobControl/Make/files b/src/postProcessing/functionObjects/jobControl/Make/files
new file mode 100644
index 0000000000000000000000000000000000000000..03a93b6bf162a19feadef94fd6f4666b12860a1a
--- /dev/null
+++ b/src/postProcessing/functionObjects/jobControl/Make/files
@@ -0,0 +1,7 @@
+abortCalculation/abortCalculation.C
+abortCalculation/abortCalculationFunctionObject.C
+
+residualControl/residualControl.C
+residualControl/residualControlFunctionObject.C
+
+LIB = $(FOAM_LIBBIN)/libjobControl
diff --git a/src/postProcessing/functionObjects/residualControl/Make/options b/src/postProcessing/functionObjects/jobControl/Make/options
similarity index 100%
rename from src/postProcessing/functionObjects/residualControl/Make/options
rename to src/postProcessing/functionObjects/jobControl/Make/options
diff --git a/src/postProcessing/functionObjects/utilities/abortCalculation/IOabortCalculation.H b/src/postProcessing/functionObjects/jobControl/abortCalculation/IOabortCalculation.H
similarity index 100%
rename from src/postProcessing/functionObjects/utilities/abortCalculation/IOabortCalculation.H
rename to src/postProcessing/functionObjects/jobControl/abortCalculation/IOabortCalculation.H
diff --git a/src/postProcessing/functionObjects/utilities/abortCalculation/abortCalculation.C b/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.C
similarity index 98%
rename from src/postProcessing/functionObjects/utilities/abortCalculation/abortCalculation.C
rename to src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.C
index 775ac861bf0234d11cd3d278e25889f095e9a672..9cd6a2af07aa5279c5e9980920f0bdfa014e1a2b 100644
--- a/src/postProcessing/functionObjects/utilities/abortCalculation/abortCalculation.C
+++ b/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.C
@@ -31,10 +31,8 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(abortCalculation, 0);
-}
+defineTypeNameAndDebug(Foam::abortCalculation, 0);
+
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
diff --git a/src/postProcessing/functionObjects/utilities/abortCalculation/abortCalculation.H b/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.H
similarity index 100%
rename from src/postProcessing/functionObjects/utilities/abortCalculation/abortCalculation.H
rename to src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.H
diff --git a/src/postProcessing/functionObjects/utilities/abortCalculation/abortCalculationFunctionObject.C b/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculationFunctionObject.C
similarity index 100%
rename from src/postProcessing/functionObjects/utilities/abortCalculation/abortCalculationFunctionObject.C
rename to src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculationFunctionObject.C
diff --git a/src/postProcessing/functionObjects/utilities/abortCalculation/abortCalculationFunctionObject.H b/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculationFunctionObject.H
similarity index 100%
rename from src/postProcessing/functionObjects/utilities/abortCalculation/abortCalculationFunctionObject.H
rename to src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculationFunctionObject.H
diff --git a/src/postProcessing/functionObjects/residualControl/IOresidualControl.H b/src/postProcessing/functionObjects/jobControl/residualControl/IOresidualControl.H
similarity index 100%
rename from src/postProcessing/functionObjects/residualControl/IOresidualControl.H
rename to src/postProcessing/functionObjects/jobControl/residualControl/IOresidualControl.H
diff --git a/src/postProcessing/functionObjects/residualControl/controlDict b/src/postProcessing/functionObjects/jobControl/residualControl/controlDict
similarity index 72%
rename from src/postProcessing/functionObjects/residualControl/controlDict
rename to src/postProcessing/functionObjects/jobControl/residualControl/controlDict
index 0af8ff7c9a3151c36e963a8d800f17d9f94b8ff7..aae3ee4d5e17b6efd73bce0e4e7187ea5a387e4b 100644
--- a/src/postProcessing/functionObjects/residualControl/controlDict
+++ b/src/postProcessing/functionObjects/jobControl/residualControl/controlDict
@@ -1,4 +1,4 @@
-*--------------------------------*- C++ -*----------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.6                                   |
@@ -37,31 +37,32 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
-
+runTimeModifiable true;
 
 functions
-(
+{
     convergenceChecks
     {
-        type           residualControl;
-        functionObjectLibs ( "libresidualControl.so" );
-        outputControl  timeStep;
-        outputInterval 1;
+        type            residualControl;
+        functionObjectLibs ( "libjobControl.so" );
+        outputControl   timeStep;
+        outputInterval  1;
 
         maxResiduals
-        (
-            (p          5e-4)
-            (U          1e-3)
-        );
-    }
-);
+        {
+            p       5e-4;
+            U       1e-3;
 
+            // possibly check turbulence fields
+            "(k|epsilon|omega)" 1e-3;
+        }
+    }
+}
 
 // ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/residualControl/residualControl.C b/src/postProcessing/functionObjects/jobControl/residualControl/residualControl.C
similarity index 86%
rename from src/postProcessing/functionObjects/residualControl/residualControl.C
rename to src/postProcessing/functionObjects/jobControl/residualControl/residualControl.C
index aed8e38dc1eab32608bf6a7f7cd67a8a8c6c6369..a7ad2233cfc947920f07d424a4682f0660fec689 100644
--- a/src/postProcessing/functionObjects/residualControl/residualControl.C
+++ b/src/postProcessing/functionObjects/jobControl/residualControl/residualControl.C
@@ -24,40 +24,35 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "residualControl.H"
-#include "dictionary.H"
 #include "fvMesh.H"
 #include "Time.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(residualControl, 0);
-}
+defineTypeNameAndDebug(Foam::residualControl, 0);
 
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-bool Foam::residualControl::checkCriteria(const bool output) const
+bool Foam::residualControl::checkCriteria(const bool verbose) const
 {
     bool achieved = true;
     const fvMesh& mesh = static_cast<const fvMesh&>(obr_);
     const dictionary& solverDict = mesh.solverPerformanceDict();
-    forAll(maxResiduals_, i)
-    {
-        const word& variableName = maxResiduals_[i].first();
-        if (solverDict.found(variableName))
-        {
-            const scalar maxResidual = maxResiduals_[i].second();
 
-            const lduMatrix::solverPerformance
-                sp(solverDict.lookup(variableName));
+    forAllConstIter(dictionary, solverDict, iter)
+    {
+        const word& variableName = iter().keyword();
+        scalar maxResidual;
 
-            const scalar eqnResidual = sp.initialResidual();
+        if (maxResiduals_.readIfPresent(variableName, maxResidual))
+        {
+            const scalar eqnResidual =
+                lduMatrix::solverPerformance(iter().stream()).initialResidual();
 
             achieved = achieved && (eqnResidual < maxResidual);
 
-            if (output)
+            if (verbose)
             {
                 Info<< "    " << variableName
                     << ": requested max residual = " << maxResidual
@@ -121,7 +116,7 @@ void Foam::residualControl::read(const dictionary& dict)
 {
     if (active_)
     {
-        dict.lookup("maxResiduals") >> maxResiduals_;
+        maxResiduals_ = dict.subDict("maxResiduals");
     }
 }
 
diff --git a/src/postProcessing/functionObjects/residualControl/residualControl.H b/src/postProcessing/functionObjects/jobControl/residualControl/residualControl.H
similarity index 90%
rename from src/postProcessing/functionObjects/residualControl/residualControl.H
rename to src/postProcessing/functionObjects/jobControl/residualControl/residualControl.H
index c222019298da39645340b65c440a54f3a94e7249..691fb089280ed90ab69a9a7f6ce6f2f5119812e9 100644
--- a/src/postProcessing/functionObjects/residualControl/residualControl.H
+++ b/src/postProcessing/functionObjects/jobControl/residualControl/residualControl.H
@@ -37,8 +37,8 @@ SourceFiles
 #ifndef residualControl_H
 #define residualControl_H
 
+#include "dictionary.H"
 #include "pointFieldFwd.H"
-#include "Tuple2.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -69,8 +69,8 @@ protected:
         //- On/off switch - on if obr_ is an fvMesh object
         bool active_;
 
-        //- List of variable name vs max residual
-        List<Tuple2<word, scalar> > maxResiduals_;
+        //- Dictionary of variable names vs max residual
+        dictionary maxResiduals_;
 
         //- Flag to indicate whether convergence criteria have been met
         bool criteriaSatisfied_;
@@ -79,7 +79,7 @@ protected:
     // Protected Member Functions
 
         //- Perform residual control checks
-        bool checkCriteria(const bool output) const;
+        bool checkCriteria(const bool verbose) const;
 
         //- Disallow default bitwise copy construct
         residualControl(const residualControl&);
@@ -113,7 +113,7 @@ public:
 
     // Member Functions
 
-        //- Return name of the system call set
+        //- Return name of the residual criteria check name
         virtual const word& name() const
         {
             return name_;
@@ -122,13 +122,13 @@ public:
         //- Read the system calls
         virtual void read(const dictionary&);
 
-        //- Execute the "executeCalls" at each time-step
+        //- Check the residual criteria at each time-step
         virtual void execute();
 
-        //- Execute the "endCalls" at the final time-loop
+        //- Report residual criteria check at the final time-loop
         virtual void end();
 
-        //- Write, execute the "writeCalls"
+        //- Write, not used
         virtual void write();
 
         //- Update for changes of mesh
diff --git a/src/postProcessing/functionObjects/residualControl/residualControlFunctionObject.C b/src/postProcessing/functionObjects/jobControl/residualControl/residualControlFunctionObject.C
similarity index 100%
rename from src/postProcessing/functionObjects/residualControl/residualControlFunctionObject.C
rename to src/postProcessing/functionObjects/jobControl/residualControl/residualControlFunctionObject.C
diff --git a/src/postProcessing/functionObjects/residualControl/residualControlFunctionObject.H b/src/postProcessing/functionObjects/jobControl/residualControl/residualControlFunctionObject.H
similarity index 100%
rename from src/postProcessing/functionObjects/residualControl/residualControlFunctionObject.H
rename to src/postProcessing/functionObjects/jobControl/residualControl/residualControlFunctionObject.H
diff --git a/src/postProcessing/functionObjects/residualControl/Make/files b/src/postProcessing/functionObjects/residualControl/Make/files
deleted file mode 100644
index c3bc44fe41247be7af01c274dd93ee76656c2db3..0000000000000000000000000000000000000000
--- a/src/postProcessing/functionObjects/residualControl/Make/files
+++ /dev/null
@@ -1,4 +0,0 @@
-residualControl.C
-residualControlFunctionObject.C
-
-LIB = $(FOAM_LIBBIN)/libresidualControl
diff --git a/src/postProcessing/functionObjects/systemCall/systemCall.C b/src/postProcessing/functionObjects/systemCall/systemCall.C
index bcafbf4bf01f117298dc70d65f993f1e01161a00..7d477cb4134acc4277d86239d5335aade0174bac 100644
--- a/src/postProcessing/functionObjects/systemCall/systemCall.C
+++ b/src/postProcessing/functionObjects/systemCall/systemCall.C
@@ -29,10 +29,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(systemCall, 0);
-}
+defineTypeNameAndDebug(Foam::systemCall, 0);
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/utilities/Make/files b/src/postProcessing/functionObjects/utilities/Make/files
index 1812a0b448a534162e144935be7751103339c772..a93fad2edadcb9a9b6f011ed423abff1d8ccb9e6 100644
--- a/src/postProcessing/functionObjects/utilities/Make/files
+++ b/src/postProcessing/functionObjects/utilities/Make/files
@@ -1,6 +1,3 @@
-abortCalculation/abortCalculation.C
-abortCalculation/abortCalculationFunctionObject.C
-
 staticPressure/staticPressure.C
 staticPressure/staticPressureFunctionObject.C
 
diff --git a/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.C b/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.C
index 9eac0dbfa7998107c6433d2ec0c034e9caeeb217..99d825fdcdb6bd593454ceec6b28b921ffcb06af 100644
--- a/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.C
+++ b/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.C
@@ -34,10 +34,7 @@ using namespace Foam::constant;
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(dsmcFields, 0);
-}
+defineTypeNameAndDebug(Foam::dsmcFields, 0);
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/utilities/staticPressure/staticPressure.C b/src/postProcessing/functionObjects/utilities/staticPressure/staticPressure.C
index f0977a0226c2b29179622df2c60a911f007c5e04..94c62f968b3bb1e1e81d1b77302c5c467be97fd0 100644
--- a/src/postProcessing/functionObjects/utilities/staticPressure/staticPressure.C
+++ b/src/postProcessing/functionObjects/utilities/staticPressure/staticPressure.C
@@ -29,10 +29,8 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(staticPressure, 0);
-}
+defineTypeNameAndDebug(Foam::staticPressure, 0);
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
diff --git a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict
index 635cefc4e8fd4366f2dc341e7213e05a8ffff09d..06ade1c9645f64ec6481ace6416658b9675c43a2 100644
--- a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict
+++ b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict
@@ -37,29 +37,30 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 functions
 {
     fileUpdate1
     {
-        type              timeActivatedFileUpdate;
+        type            timeActivatedFileUpdate;
         functionObjectLibs ("libutilityFunctionObjects.so");
-        outputControl     timeStep;
-        outputInterval    1;
-        fileToUpdate      "$FOAM_CASE/system/fvSolution";
+        outputControl   timeStep;
+        outputInterval  1;
+        fileToUpdate    "$FOAM_CASE/system/fvSolution";
+
         timeVsFile
         (
-            (-1 "$FOAM_CASE/system/fvSolution.0")
-            (0.10 "$FOAM_CASE/system/fvSolution.10")
-            (0.20 "$FOAM_CASE/system/fvSolution.20")
-            (0.35 "$FOAM_CASE/system/fvSolution.35")
+            ( -1   "$FOAM_CASE/system/fvSolution.0"  )
+            ( 0.10 "$FOAM_CASE/system/fvSolution.10" )
+            ( 0.20 "$FOAM_CASE/system/fvSolution.20" )
+            ( 0.35 "$FOAM_CASE/system/fvSolution.35" )
         );
     }
 }
diff --git a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C
index 838b15b1768e6866a9143e0e6f7fd8db23da6e05..c7d7b5006fb5cac26bda9b414541cdd82b0f4835 100644
--- a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C
+++ b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C
@@ -30,10 +30,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(timeActivatedFileUpdate, 0);
-}
+defineTypeNameAndDebug(Foam::timeActivatedFileUpdate, 0);
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurface.C b/src/sampling/sampledSurface/isoSurface/isoSurface.C
index f3c801faf6c0fb8387a397a4f673227907391b1c..405065906fa2a066f8901b715139dc6dea90a738 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurface.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurface.C
@@ -36,10 +36,8 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(isoSurface, 0);
-}
+defineTypeNameAndDebug(Foam::isoSurface, 0);
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
index 177c42253f63f83fdb061092bf89d624eef60600..822c668f8fed0ff6ea9099b971568334ec051fa7 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
@@ -34,10 +34,8 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(isoSurfaceCell, 0);
-}
+defineTypeNameAndDebug(Foam::isoSurfaceCell, 0);
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
diff --git a/tutorials/Alltest b/tutorials/Alltest
index 8920bfc8a2f6e3386117335fac9d2b5fdb554c79..36581af575f61d3e8ee7579db46b7b0924ef0cce 100755
--- a/tutorials/Alltest
+++ b/tutorials/Alltest
@@ -36,11 +36,11 @@ usage()
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
 
-usage: $0 [OPTION]
+usage: ${0##*/} [OPTION]
 
 options:
-  -d            sets up a default scheme on all schemes
-  -h            this usage
+  -default          sets up a default scheme on all schemes
+  -help             print the usage
 
 * quickly tests the tutorials and writes out the scheme/solver information
 
@@ -48,6 +48,30 @@ USAGE
     exit 1
 }
 
+#------------------------------------------------------------------------------
+
+unset DEFAULT_SCHEMES
+
+# parse options
+while [ "$#" -gt 0 ]
+do
+    case "$1" in
+    -h | -help)
+        usage
+        ;;
+    -d | -default)
+        DEFAULT_SCHEMES=true
+        shift
+        ;;
+    -*)
+        usage "unknown option: '$*'"
+        ;;
+    *)
+        break
+        ;;
+    esac
+done
+
 
 setDefaultFvSchemes()
 {
@@ -98,6 +122,7 @@ done
 
 [ -f "$MAIN_CONTROL_DICT" ] || usage "main controlDict not found"
 
+
 TUTORIALS_DIR=.
 TEST_RUN_DIR=../tutorialsTest
 FV_SCHEMES=\
@@ -113,30 +138,7 @@ SCHEMES_FILE="FvSchemes"
 SCHEMES_TEMP="FvSchemes.temp"
 SOLVERS_FILE="FvSolution"
 SOLVERS_TEMP="FvSolution.temp"
-DEFAULT_SCHEMES=0
 
-#
-# OPTIONS
-#
-OPTS=`getopt hd $*`
-if [ $? -ne 0 ]
-then
-    usage "Aborting due to invalid option"
-fi
-eval set -- "$OPTS"
-while [ $1 != -- ]
-do
-    case $1 in
-    -d)
-        DEFAULT_SCHEMES=1
-        ;;
-    -h)
-        usage
-        ;;
-    esac
-    shift
-done
-shift
 
 #
 # MAIN
@@ -182,7 +184,7 @@ do
     ${CD}.org > ${CD}
 done
 
-if [ $DEFAULT_SCHEMES = 1 ]
+if [ "$DEFAULT_SCHEMES" = true ]
 then
     echo "Modifying the fvSchemes to contain only default schemes"
     for FV_SC in `find . -name fvSchemes`
@@ -209,8 +211,7 @@ do
     echo "$APP: " | tr -d "\n" >> $SOLVERS_FILE
     for ST in $FV_SCHEMES
     do
-        rm $SCHEMES_TEMP > /dev/null 2>&1
-        rm $SOLVERS_TEMP > /dev/null 2>&1
+        rm $SCHEMES_TEMP $SOLVERS_TEMP > /dev/null 2>&1
         echo "  ${ST}" >> $SCHEMES_FILE
         for LOG in `find ${APP} -name "log.${APP}"`
         do
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict b/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict
index 3ec12800948d868b6f0c20fb9a341dcab2394269..529a96648632a4cf7df2809a78caf4b0d4618174 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict
+++ b/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 graphFormat     raw;
 
diff --git a/tutorials/basic/laplacianFoam/flange/system/controlDict b/tutorials/basic/laplacianFoam/flange/system/controlDict
index cca0701813343ccfa4eb3a6d5af977c97d13ef07..8311c5deb6f7eff9de4c70fdae39824ac3a65a73 100644
--- a/tutorials/basic/laplacianFoam/flange/system/controlDict
+++ b/tutorials/basic/laplacianFoam/flange/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/basic/potentialFoam/cylinder/system/controlDict b/tutorials/basic/potentialFoam/cylinder/system/controlDict
index 0caf916eca306454fda731d87bb4a1b621cc98da..afa091f846d88ac2fe6f0bc76b41467f79a030ad 100644
--- a/tutorials/basic/potentialFoam/cylinder/system/controlDict
+++ b/tutorials/basic/potentialFoam/cylinder/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/basic/potentialFoam/pitzDaily/system/controlDict b/tutorials/basic/potentialFoam/pitzDaily/system/controlDict
index 0caf916eca306454fda731d87bb4a1b621cc98da..afa091f846d88ac2fe6f0bc76b41467f79a030ad 100644
--- a/tutorials/basic/potentialFoam/pitzDaily/system/controlDict
+++ b/tutorials/basic/potentialFoam/pitzDaily/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict b/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict
index b406e85ce23203d302f3f4fec1089bdd2de22578..e7eda1d5fca7b3959bbcaf537c666ef53bf7c3e8 100644
--- a/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict
+++ b/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict b/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict
index 79e443d105ef523e1f69760d5f83f1e74be700b6..87dbaa3ad33715acb267b48005ff6b4e2c92f099 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
@@ -57,6 +57,7 @@ functions
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         enabled         true;
         outputControl   outputTime;
+
         fields
         (
             U
@@ -76,5 +77,4 @@ functions
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict
index 6ab5661f2a5c1a15537e9aa5983979cd793fc1b6..b23a2829baf6354714942f10192fa345aa13899d 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression compressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
@@ -57,6 +57,7 @@ functions
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         enabled         true;
         outputControl   outputTime;
+
         fields
         (
             U
@@ -76,5 +77,4 @@ functions
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict
index 443097f40350f04979682cf18e1287d2ae22b802..903a8989d729ad00d5d705666d8a4cbb9943d5c6 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict b/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict
index 43fa1de2051a7d6d3a5b1d3d7331d548d34389d1..ed8ef41f8bd2c07aa4421a49c8f31d9cca28d7f6 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict
+++ b/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict
@@ -37,7 +37,7 @@ writeFormat     binary;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
@@ -47,7 +47,7 @@ adjustTimeStep  yes;
 
 maxCo           0.1;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/engineFoam/kivaTest/system/controlDict b/tutorials/combustion/engineFoam/kivaTest/system/controlDict
index 8da8d6cb377986ecc8dc289718037526406e08fa..295291738fa8fb8ee18a1c1dee644cd2b2f131a4 100644
--- a/tutorials/combustion/engineFoam/kivaTest/system/controlDict
+++ b/tutorials/combustion/engineFoam/kivaTest/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
diff --git a/tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st
index 8da8d6cb377986ecc8dc289718037526406e08fa..295291738fa8fb8ee18a1c1dee644cd2b2f131a4 100644
--- a/tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st
+++ b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
diff --git a/tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd
index f42bfbc115ec5a3ded68f8b47601735770f93d3b..34a2d50b06ed1c5133e9804682b86165a203d93d 100644
--- a/tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd
+++ b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/controlDict b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/controlDict
index aa179ea0851a6c7aa5a9f38829869a9358f55234..b2ef1f85d98e7df6dace771df1e228f91b611ee5 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/controlDict
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/controlDict
@@ -36,7 +36,7 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
@@ -44,7 +44,7 @@ timePrecision   6;
 
 graphFormat     raw;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/controlDict b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/controlDict
index d8eadc979c442324b874a8eba1c2519a47b357ef..82360ae4d75ae4dd92ccd22351ec97a9ed72c81d 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/controlDict
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/controlDict b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/controlDict
index 041eb98faadbabeb7ede4e6955fceb9ee60b1adc..ca419cca9d028499b192f0c160f4b028fa4b3c39 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/controlDict
@@ -37,7 +37,7 @@ writeFormat     ascii;
 
 writePrecision  15;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/sampleCone b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/sampleCone
index 25ee12e0ac60ae3af1ff3af08cfa043a494ada05..450818c39c0efc42f98335a76cb602e416c39eff 100755
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/sampleCone
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/sampleCone
@@ -20,32 +20,34 @@ USAGE
     exit 1
 }
 
+# -----------------------------------------------------------------------------
 
 unset timeOpt
 
-OPTS=`getopt hl $*`
-[ $? -eq 0 ] || usage "Aborting due to invalid option"
-
-eval set -- "$OPTS"
-while [ $1 != -- ]
+# parse options
+while [ "$#" -gt 0 ]
 do
-    case $1 in
-    -l)
+    case "$1" in
+    -h | -help)
+        usage
+        ;;
+    -l | -latestTime)
         timeOpt="-latestTime"
+        shift
         ;;
-    -h)
-        usage
+    *)
+        usage "unknown option/argument: '$*'"
         ;;
     esac
-    shift
 done
-shift
+
 
 sample $timeOpt
-SDIR="sets"
+SDIR=sets
 LSDIR=`ls $SDIR | head -1`
 EXAMPLE_FILE=`ls -1 $SDIR/${LSDIR}/* | head -1`
 FS=`basename $EXAMPLE_FILE | cut -d_ -f2-`
+
 for d in $SDIR/*
 do
     cat ${d}/cone25_${FS} ${d}/cone55_${FS} ${d}/base_${FS} > ${d}/biconic_${FS}
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict
index 11ef1e4f4dae2b365010d1be81cd5fd922cc370d..99b934db514c3f10721e79ae1c3386a909107f38 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict
@@ -37,7 +37,7 @@ writeFormat     ascii;
 
 writePrecision  15;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict b/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict
index eb4fe54194655627922b6ef0c81f201edf1d0cba..d0a8d7d4d27a8b7e25f6ec40022f6265b883c3cf 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict
index e4dca7f65f1bbb06b6af81de826fc1e20eca8c95..d31d83f2fa9d57eb1b68a840253cb411851d6fe8 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict
@@ -37,7 +37,7 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
@@ -45,7 +45,7 @@ timePrecision   6;
 
 graphFormat     raw;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict b/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict
index 4446eb55c2dd1d78b8b44d50bee567827b0c1479..f06597be29fe708bdaf56194dbf21be1de7a21c9 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict
index 8dc253af757c1abdc4354cac36bc7b3d0eb771ad..46c2cd2dd4b29edf44905b09fbb2f8589e985e87 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict
index 4e53754bf71392d8ab47834579ce07df5e8cdf9f..cbda6c7e8bcbf4a0c1d722e5e58f33539b5a402c 100644
--- a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict
index 113d97d8b8dd1e1a93aaedcc1e8f176259a08f7e..ee66ef78e6a23163fa4beee1d2b980a3c3087ce2 100644
--- a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict
@@ -37,19 +37,18 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
 maxCo           0.5;
 
-
 functions
 {
     fieldAverage1
@@ -58,6 +57,7 @@ functions
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         enabled         true;
         outputControl   outputTime;
+
         fields
         (
             U
@@ -77,5 +77,4 @@ functions
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict b/tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict
index f7c5890f48b2a075f61daade7b86e01305a1e329..5207df21bbc4b13d4af263f9adae5c8d4def0932 100644
--- a/tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict
+++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/controlDict b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/controlDict
index b79e14b234e0191949729846152720a9687067e5..1c2666f2ef4191ce17f1ae387d01741d8643f17c 100644
--- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/controlDict
+++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict
index 10de02b0d7653d67990ec7dd9e90914085f56fd7..ee1997640aa54e79ae4f2eaea05fc8907e2f1e8d 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict
@@ -37,7 +37,7 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
@@ -45,7 +45,7 @@ timePrecision   6;
 
 graphFormat     raw;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict
index 88d62b98cc2648330cce6426b6043397caed194d..fc5b4b95bc383c54f407d515ef7ea449a128a940 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict
@@ -37,7 +37,7 @@ writeFormat     binary;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
@@ -45,7 +45,7 @@ timePrecision   6;
 
 graphFormat     raw;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/system/controlDict b/tutorials/compressible/rhoSimplecFoam/squareBend/system/controlDict
index 49ae3f8a17dea10fc4665f7df8c730bc95e82b1a..d64bc59993c3fcd51236244374fb14bf7a880084 100644
--- a/tutorials/compressible/rhoSimplecFoam/squareBend/system/controlDict
+++ b/tutorials/compressible/rhoSimplecFoam/squareBend/system/controlDict
@@ -37,7 +37,7 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
@@ -45,7 +45,7 @@ timePrecision   6;
 
 graphFormat     raw;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/system/controlDict b/tutorials/compressible/rhoSonicFoam/forwardStep/system/controlDict
index 467752f0ef27f79e567fca6b60f37b565c71b4b5..a1706f5b3a6eb37ef11b73a81ae262bb34fd654f 100644
--- a/tutorials/compressible/rhoSonicFoam/forwardStep/system/controlDict
+++ b/tutorials/compressible/rhoSonicFoam/forwardStep/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/system/controlDict b/tutorials/compressible/rhoSonicFoam/shockTube/system/controlDict
index 229b6c70467ec7455fb192c752cd60f4bcd6de7a..7e561157373d175b3b2243b4986604c102d40c5a 100644
--- a/tutorials/compressible/rhoSonicFoam/shockTube/system/controlDict
+++ b/tutorials/compressible/rhoSonicFoam/shockTube/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/system/controlDict b/tutorials/compressible/rhopSonicFoam/shockTube/system/controlDict
index 4609dc364a3bf2c1303249624f6b051b18f8875d..98545e5953f25c4f2dee69e966be75e2f1a40b6e 100644
--- a/tutorials/compressible/rhopSonicFoam/shockTube/system/controlDict
+++ b/tutorials/compressible/rhopSonicFoam/shockTube/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/controlDict b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/controlDict
index 711c87717865e89fd7bbf0abc3b4bd7ceb8e67e1..2538fb4a586d471884f4d34d62fabae07e0841d2 100644
--- a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/controlDict
+++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict
index 2243969127c36b8cc195a64e2f38bb06d5aab255..9a331d0afee128f0ce281311c4018059dbe1029a 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict b/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict
index 113b703349fd71e1a856f75610f7cba060390509..b146e22489605ac452b5bf521c0351299ca2ab27 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
index d53cf7983e63b4015160c80aaf92f77f781e23bd..9e4c9487fafecd0770686b10040745f0b688fe33 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
@@ -37,26 +37,28 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression compressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 functions
 {
     forces
     {
-        type        forceCoeffs;
+        type            forceCoeffs;
         functionObjectLibs ( "libforces.so" );
-        outputControl timeStep;
-        outputInterval 1;
+        outputControl   timeStep;
+        outputInterval  1;
+
         patches
         (
             WALL10
         );
+
         pName       p;
         UName       U;
         log         true;
@@ -71,5 +73,4 @@ functions
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/prism/system/controlDict b/tutorials/compressible/sonicFoam/ras/prism/system/controlDict
index a9f43fbb9eebac9903694f0f30e52b81b069c19e..b67a03963cbbb8aef9893259582bff69c449ab50 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/system/controlDict
+++ b/tutorials/compressible/sonicFoam/ras/prism/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict
index 2f43908bcffd695fe33e0442e6cecab185084c0b..8b219f140bf3edf60a18509e16e5e4e8f67c94a8 100644
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression compressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict
index cf92f926ccddbacfc6fb9dcf49824f475bf660d1..d67f3c119c4b4d34639c58434875ef79daa92040 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict
@@ -37,90 +37,90 @@ writeFormat     ascii;
 
 writePrecision  10;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
 functions
-(
+{
     dsmcFields1
     {
-        type dsmcFields;
-        enabled   on;
+        type            dsmcFields;
         functionObjectLibs ( "libutilityFunctionObjects.so" );
-        outputControl     outputTime;
+        enabled         true;
+        outputControl   outputTime;
     }
     fieldAverage1
     {
-        type fieldAverage;
+        type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        outputControl     outputTime;
-        resetOnOutput     off;
+        outputControl   outputTime;
+        resetOnOutput   off;
+
         fields
         (
             rhoN
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             rhoM
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             dsmcRhoN
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             momentum
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             linearKE
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             internalE
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             iDof
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             q
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             fD
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
         );
     }
-);
-
+}
 
 // ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict
index 83c46d5907e10f2a42eb81dcd2077c3630ca00c3..26b01f238addca8f92116b0dfafa7ab365dfa8ec 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict
@@ -37,90 +37,90 @@ writeFormat     ascii;
 
 writePrecision  10;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
 functions
-(
+{
     dsmcFields1
     {
-        type dsmcFields;
-        enabled   on;
+        type            dsmcFields;
         functionObjectLibs ( "libutilityFunctionObjects.so" );
-        outputControl     outputTime;
+        enabled         true;
+        outputControl   outputTime;
     }
     fieldAverage1
     {
-        type fieldAverage;
+        type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        outputControl     outputTime;
-        resetOnOutput     off;
+        outputControl   outputTime;
+        resetOnOutput   off;
+
         fields
         (
             rhoN
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             rhoM
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             dsmcRhoN
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             momentum
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             linearKE
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             internalE
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             iDof
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             q
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             fD
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
         );
     }
-);
-
+}
 
 // ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict
index 2e26dcc5d6051789d18fae8db961a52fb3c4a82b..abee5850f10195f3e0adeeea38796c255f3d202a 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict
@@ -37,90 +37,90 @@ writeFormat     ascii;
 
 writePrecision  10;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
 functions
-(
+{
     dsmcFields1
     {
-        type dsmcFields;
-        enabled   on;
+        type            dsmcFields;
         functionObjectLibs ( "libutilityFunctionObjects.so" );
-        outputControl     outputTime;
+        enabled         true;
+        outputControl   outputTime;
     }
     fieldAverage1
     {
-        type fieldAverage;
+        type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        outputControl     outputTime;
-        resetOnOutput     off;
+        outputControl   outputTime;
+        resetOnOutput   off;
+
         fields
         (
             rhoN
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             rhoM
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             dsmcRhoN
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             momentum
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             linearKE
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             internalE
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             iDof
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             q
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             fD
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
         );
     }
-);
-
+}
 
 // ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
index 44ba6548b4f0cdeb2294a47b7cd3b248f7cea9c8..31f6cf1b8de8eaf45b8aac2d4e60d15c9bb8457f 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
@@ -38,104 +38,104 @@ writeFormat     ascii;
 
 writePrecision  10;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
 functions
-(
+{
     dsmcFields1
     {
-        type dsmcFields;
-        enabled   on;
+        type            dsmcFields;
         functionObjectLibs ( "libutilityFunctionObjects.so" );
-        outputControl     outputTime;
+        enabled         true;
+        outputControl   outputTime;
     }
 
     fieldAverage1
     {
-        type fieldAverage;
+        type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        outputControl     outputTime;
-        resetOnOutput     off;
+        outputControl   outputTime;
+        resetOnOutput   off;
+
         fields
         (
             rhoN
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             rhoM
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             dsmcRhoN
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             momentum
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             linearKE
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             internalE
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             iDof
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             q
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             fD
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
         );
     }
 
     forces1
     {
-        type        forces;
-        enabled     on;
+        type            forces;
+        enabled         true;
         functionObjectLibs ( "libforces.so" );
-        outputControl     outputTime;
-        patches     ( obstacle );
+        outputControl   outputTime;
+        patches         ( obstacle );
         directForceDensity true;
-        fDName      fDMean;
-        CofR        ( 0 0 0 );
-        log         on;
+        fDName          fDMean;
+        CofR            ( 0 0 0 );
+        log             on;
     }
-);
-
+}
 
 // ************************************************************************* //
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict
index 4e7379793cd0867fee06844007aef7c46a91d201..6846736f6be63f7fef67c1ec70d2371768e06f04 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict
@@ -36,13 +36,13 @@ writeFormat     ascii;
 
 writePrecision  12;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict
index 4c457aca58b3a3dfd8ed0e6275231b17f9f87a62..dda6c1a4de2e523c4439c28d1964d89e285dd042 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict
@@ -36,13 +36,13 @@ writeFormat     ascii;
 
 writePrecision  12;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict
index 6f3bab47afd4f4fe90bba5876183cc1eab08d965..708791f4ec1587ff7e038013329ad2ad9e194c12 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict
@@ -36,13 +36,13 @@ writeFormat     ascii;
 
 writePrecision  12;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
diff --git a/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/controlDict b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/controlDict
index ff30dab3ea39a46cf713dcf0732cdf33877d8e0e..bf764fc1e075cd80e4a1681295ac1ec1e2e31d61 100644
--- a/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/controlDict
+++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/system/controlDict b/tutorials/electromagnetics/mhdFoam/hartmann/system/controlDict
index ba9f94e16eec51b4e656cc0e0a945e61772a4f02..3a20fa96d56b2f6717b598ca40e13b4223153235 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/system/controlDict
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/financial/financialFoam/europeanCall/system/controlDict b/tutorials/financial/financialFoam/europeanCall/system/controlDict
index 5f82f054df1fc7db6a4be3738ff87f60358f8e2f..ce4e3a02f6ab6ca650236bed4979939e60bc9a8a 100644
--- a/tutorials/financial/financialFoam/europeanCall/system/controlDict
+++ b/tutorials/financial/financialFoam/europeanCall/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 graphFormat     raw;
 
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/controlDict
index a2bd31228b3cd486b0846a93441b5ca5ecc7a232..53d1882a044bad7508845c178951f2916e24a570 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/controlDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/controlDict
index ee44e2cc0510c57099bb1d595ef7ee164c7381d1..7110aa11fb308fcbd6fced1b1dcd2508bdc5a7ef 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/controlDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict
index 85273a5e8edd6aa92fadc6ada687a6176df07dc0..9ed612f7fd0484aa79daaeaae11575d6e3e91d4b 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/controlDict
index f27c341a6522a1610f26f34278a0c8b1f5ea8f94..11e3efe957916a56bee39b245f8a40fd42cd2bde 100644
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/controlDict
+++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict
index aecc274b4b029c6919585ee2ac06f48eac7f972e..e250c63939d7c025988d79068560350c1ba8add0 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict
@@ -36,13 +36,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/controlDict
index 86ff949dd916718ddf222cffd17e2dbc5ffa95e0..e2e21ebecebd7b13c480b70a7eebdf425d119f1c 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/controlDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/controlDict b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/controlDict
index 6733a15023fb35718e037abeb4d6d254684d5dcf..7528e1c6c3abfa712e7908d576421edf7564b545 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/controlDict
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/controlDict b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/controlDict
index 58fd12acffb498ec6ea427406a97e55146b1824f..ed46d31ca4a48c51012cdfba5284af0b6d30b818 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/controlDict
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     binary;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict
index 3e22a4695d20b7d82e9aef3ddfa178adecf6eca6..f3709cd0011c9968a108a69825d9399a83c82de6 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  7;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 maxCo           0.3;
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict
index c29fededa3b9ae22d847656b16dd5736e83de08e..ed44768bff7696611623cad0b7de579568039d17 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict
@@ -38,13 +38,13 @@ writeFormat     ascii;
 
 writePrecision  7;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 maxCo           0.3;
 
diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/controlDict b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/controlDict
index 2eaccf5916feaebdea36a497f3dd0940488aa8fd..95adb71e42250c5b503359defca284a5c96ddfda 100644
--- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/controlDict
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/controlDict b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/controlDict
index 733efddbc0a97637ab3a6652d20dd9e8c25b8bd1..9ac6b42a1af03f906825e448b17ad69292eaad33 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/controlDict
@@ -37,12 +37,12 @@ writeFormat     ascii;
 
 writePrecision  12;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   12;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/controlDict b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/controlDict
index d66c8b5c05bf677a3f6ee8048af00cc39983bfd1..65ab5dd49ad1bbf855882370e22ee0a877cbca74 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/controlDict
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 graphFormat     raw;
 
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/controlDict b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/controlDict
index d66c8b5c05bf677a3f6ee8048af00cc39983bfd1..65ab5dd49ad1bbf855882370e22ee0a877cbca74 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/controlDict
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 graphFormat     raw;
 
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/controlDict b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/controlDict
index 7bf69941d935dc1a593db195e87836862aa80e5d..0f67e6809657fa86dbb6d8db1f232bdfd40a7465 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/controlDict
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/controlDict
@@ -44,13 +44,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 graphFormat     raw;
 
diff --git a/tutorials/incompressible/channelFoam/channel395/system/controlDict b/tutorials/incompressible/channelFoam/channel395/system/controlDict
index 86186d7b443524ade9b0e1a1735bbe852567d5d5..3f087960b9401c85966c212dfda23c5be9b80283 100644
--- a/tutorials/incompressible/channelFoam/channel395/system/controlDict
+++ b/tutorials/incompressible/channelFoam/channel395/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 functions
 {
@@ -53,6 +53,7 @@ functions
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         enabled         true;
         outputControl   outputTime;
+
         fields
         (
             U
diff --git a/tutorials/incompressible/icoFoam/cavity/system/controlDict b/tutorials/incompressible/icoFoam/cavity/system/controlDict
index 0e0ad67efd4dc19a63635d74a31c3de926b9e935..9010dcf8be0225d2a91516f9fb9c4890e11e4c10 100644
--- a/tutorials/incompressible/icoFoam/cavity/system/controlDict
+++ b/tutorials/incompressible/icoFoam/cavity/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/icoFoam/cavityClipped/system/controlDict b/tutorials/incompressible/icoFoam/cavityClipped/system/controlDict
index e205e75c4dc42d4e11751e3a7cc5c33b9623cc17..43e86aee43211cb9324868ea8c760ddb8949c24b 100644
--- a/tutorials/incompressible/icoFoam/cavityClipped/system/controlDict
+++ b/tutorials/incompressible/icoFoam/cavityClipped/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/icoFoam/cavityGrade/system/controlDict b/tutorials/incompressible/icoFoam/cavityGrade/system/controlDict
index 853fdc3f1c9e12781e6aff95ac06728ecfed547c..4fdb6f820f223a44fd5e63a75624231cd9ae1d0c 100644
--- a/tutorials/incompressible/icoFoam/cavityGrade/system/controlDict
+++ b/tutorials/incompressible/icoFoam/cavityGrade/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/icoFoam/elbow/system/controlDict b/tutorials/incompressible/icoFoam/elbow/system/controlDict
index ab4cee61e1db8949fd5a8077bbaf6e91efbd2408..68280b0306ae232140bc4dcf38ebaf58c8db2efd 100644
--- a/tutorials/incompressible/icoFoam/elbow/system/controlDict
+++ b/tutorials/incompressible/icoFoam/elbow/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/controlDict b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/controlDict
index 4627c47f661fe93240fde5eea6ff4cb0eb6697be..70c54bacd9198438b42579349b58de80eea9b213 100644
--- a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/controlDict
+++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict
index fac973c9f9e5336e3df6a40df659c4206c6a5131..a4dca3b050cefcde4d61fae19b6911afed2215f3 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     binary;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict b/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict
index 57334dbe9aef90799b0ab9b3c5827a09c94d9222..f1c8b836742159b4b30ca12be85c652f23d3221d 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
@@ -53,11 +53,22 @@ functions
 {
     probes
     {
-        type        probes;
+        type            probes;
         // Where to load it from
         functionObjectLibs ( "libsampling.so" );
         // Name of the directory for probe data
-        name        probes;
+        name            probes;
+
+        // Write at same frequency as fields
+        outputControl   outputTime;
+        outputInterval  1;
+
+        // Fields to be probed
+        fields
+        (
+            p U
+        );
+
         probeLocations
         (
             ( 1e-06 0 0.01 )        // at inlet
@@ -65,15 +76,7 @@ functions
             ( 0.21 0.20999 0.01 )   // at outlet2
             ( 0.21 0 0.01 )         // at central block
         );
-
-        // Fields to be probed
-        fields ( p U );
-
-        // Write at same frequency as fields
-        outputControl   outputTime;
-        outputInterval  1;
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
index 736a5c8d08af40f9c710cccd501be2b6cd5ea476..d7180759a2ea562abc338e0db0ba3ae32b999904 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 functions
 {
@@ -54,6 +54,12 @@ functions
         enabled         true;
         outputControl   timeStep;
         outputInterval  1;
+
+        fields
+        (
+            p
+        );
+
         probeLocations
         (
             ( 0.0254 0.0253 0 )
@@ -65,10 +71,6 @@ functions
             ( 0.1778 0.0253 0 )
         );
 
-        fields
-        (
-            p
-        );
     }
 
     fieldAverage1
@@ -77,6 +79,7 @@ functions
         functionObjectLibs ("libfieldFunctionObjects.so");
         enabled         true;
         outputControl   outputTime;
+
         fields
         (
             U
@@ -96,5 +99,4 @@ functions
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict
index fbef5b4915d4c143a3d95606385909f26b9b11ed..ca81fc41e9db693069800eeecf5716753c6f273b 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 functions
 {
@@ -54,6 +54,12 @@ functions
         enabled         true;
         outputControl   timeStep;
         outputInterval  1;
+
+        fields
+        (
+            p
+        );
+
         probeLocations
         (
             ( 0.0254 0.0253 0 )
@@ -64,10 +70,6 @@ functions
             ( 0.1524 0.0253 0 )
             ( 0.1778 0.0253 0 )
         );
-        fields
-        (
-            p
-        );
     }
 
     fieldAverage1
@@ -76,6 +78,7 @@ functions
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         enabled         true;
         outputControl   outputTime;
+
         fields
         (
             U
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/system/controlDict b/tutorials/incompressible/pisoFoam/ras/cavity/system/controlDict
index 16d26899f358186c3ff42f845869ef2ce6d86044..07e5c1bcbff4e571dec678dfce7dc698269b16e3 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavity/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/controlDict b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/controlDict
index b82034e8a2b3356be8eb6028e8b12609d3c36d38..f94e18ff299aaffb1878970b1c284678fe7c9294 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/controlDict
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/controlDict
@@ -37,7 +37,7 @@ writeFormat     binary;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
@@ -45,7 +45,7 @@ timePrecision   6;
 
 graphFormat     raw;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict
index f718e03fc7c9a236ce8a7b4fbef3479bd2c233ca..4e89e54565be206bdc1003e125369cb3aaf9b4e4 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict
@@ -37,7 +37,7 @@ writeFormat     binary;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
@@ -45,7 +45,7 @@ timePrecision   6;
 
 graphFormat     raw;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict b/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict
index c53ead2bb01b0dbdd37c3006261badee5f3f7802..5de491639a1005089042ebe5faa2452765d627d1 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict
@@ -18,7 +18,7 @@ application     shallowWaterFoam;
 
 startFrom       startTime;
 
-startTime      0;
+startTime       0;
 
 stopAt          endTime;
 
@@ -36,13 +36,12 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable no;
-
+runTimeModifiable false;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/system/controlDict b/tutorials/incompressible/simpleFoam/airFoil2D/system/controlDict
index af1b95f6e8fea5be7789bc988aa36c83737f350c..0a6d85ef3d567db516d4113db2caeb71b558758f 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary b/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary
index 3c2a064fff04bf911ac962c8708db1b970fd7998..7407d3a47ddcab378b61aff99203df2e97078575 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary
+++ b/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary
@@ -21,433 +21,433 @@ FoamFile
     {
         type            patch;
         nFaces          320;
-        startFace       1016673;
+        startFace       955219;
     }
     inlet
     {
         type            patch;
         nFaces          64;
-        startFace       1016993;
+        startFace       955539;
     }
     outlet
     {
         type            patch;
         nFaces          64;
-        startFace       1017057;
+        startFace       955603;
     }
     lowerWall
     {
         type            wall;
         nFaces          5330;
-        startFace       1017121;
+        startFace       955667;
     }
     upperWall
     {
         type            patch;
         nFaces          160;
-        startFace       1022451;
+        startFace       960997;
     }
     motorBike_frt-fairing:001%1
     {
         type            wall;
-        nFaces          6626;
-        startFace       1022611;
+        nFaces          6595;
+        startFace       961157;
     }
     motorBike_windshield:002%2
     {
         type            wall;
         nFaces          50;
-        startFace       1029237;
+        startFace       967752;
     }
     motorBike_rr-wh-rim:005%5
     {
         type            wall;
-        nFaces          181;
-        startFace       1029287;
+        nFaces          178;
+        startFace       967802;
     }
     motorBike_rr-wh-rim:010%10
     {
         type            wall;
         nFaces          340;
-        startFace       1029468;
+        startFace       967980;
     }
     motorBike_fr-wh-rim:011%11
     {
         type            wall;
         nFaces          474;
-        startFace       1029808;
+        startFace       968320;
     }
     motorBike_fr-wh-brake-disk:012%12
     {
         type            wall;
         nFaces          54;
-        startFace       1030282;
+        startFace       968794;
     }
     motorBike_frame:016-shadow%13
     {
         type            wall;
-        nFaces          131;
-        startFace       1030336;
+        nFaces          128;
+        startFace       968848;
     }
     motorBike_rear-susp:014%14
     {
         type            wall;
-        nFaces          1073;
-        startFace       1030467;
+        nFaces          1080;
+        startFace       968976;
     }
     motorBike_rear-susp:014-shadow%15
     {
         type            wall;
-        nFaces          159;
-        startFace       1031540;
+        nFaces          149;
+        startFace       970056;
     }
     motorBike_frame:016%16
     {
         type            wall;
-        nFaces          20;
-        startFace       1031699;
+        nFaces          30;
+        startFace       970205;
     }
     motorBike_rr-wh-rim:005-shadow%17
     {
         type            wall;
-        nFaces          25;
-        startFace       1031719;
+        nFaces          27;
+        startFace       970235;
     }
     motorBike_rr-wh-chain-hub:022%22
     {
         type            wall;
         nFaces          141;
-        startFace       1031744;
+        startFace       970262;
     }
     motorBike_rearseat%24
     {
         type            wall;
         nFaces          432;
-        startFace       1031885;
+        startFace       970403;
     }
     motorBike_frt-fairing%25
     {
         type            wall;
         nFaces          626;
-        startFace       1032317;
+        startFace       970835;
     }
     motorBike_windshield%26
     {
         type            wall;
-        nFaces          428;
-        startFace       1032943;
+        nFaces          432;
+        startFace       971461;
     }
     motorBike_headlights%27
     {
         type            wall;
         nFaces          161;
-        startFace       1033371;
+        startFace       971893;
     }
     motorBike_driversseat%28
     {
         type            wall;
         nFaces          367;
-        startFace       1033532;
+        startFace       972054;
     }
     motorBike_rear-body%29
     {
         type            wall;
         nFaces          2076;
-        startFace       1033899;
+        startFace       972421;
     }
     motorBike_fuel-tank%30
     {
         type            wall;
         nFaces          912;
-        startFace       1035975;
+        startFace       974497;
     }
     motorBike_exhaust%31
     {
         type            wall;
-        nFaces          2391;
-        startFace       1036887;
+        nFaces          2390;
+        startFace       975409;
     }
     motorBike_rr-wh-rim%32
     {
         type            wall;
         nFaces          1430;
-        startFace       1039278;
+        startFace       977799;
     }
     motorBike_fr-mud-guard%33
     {
         type            wall;
-        nFaces          767;
-        startFace       1040708;
+        nFaces          758;
+        startFace       979229;
     }
     motorBike_fr-wh-rim%34
     {
         type            wall;
-        nFaces          592;
-        startFace       1041475;
+        nFaces          591;
+        startFace       979987;
     }
     motorBike_fr-wh-brake-disk%35
     {
         type            wall;
-        nFaces          533;
-        startFace       1042067;
+        nFaces          534;
+        startFace       980578;
     }
     motorBike_fr-brake-caliper%36
     {
         type            wall;
         nFaces          164;
-        startFace       1042600;
+        startFace       981112;
     }
     motorBike_fr-wh-tyre%37
     {
         type            wall;
-        nFaces          1118;
-        startFace       1042764;
+        nFaces          1116;
+        startFace       981276;
     }
     motorBike_hbars%38
     {
         type            wall;
         nFaces          535;
-        startFace       1043882;
+        startFace       982392;
     }
     motorBike_fr-forks%39
     {
         type            wall;
-        nFaces          1144;
-        startFace       1044417;
+        nFaces          1143;
+        startFace       982927;
     }
     motorBike_chain%40
     {
         type            wall;
         nFaces          474;
-        startFace       1045561;
+        startFace       984070;
     }
     motorBike_rr-wh-tyre%41
     {
         type            wall;
-        nFaces          1785;
-        startFace       1046035;
+        nFaces          1786;
+        startFace       984544;
     }
     motorBike_square-dial%42
     {
         type            wall;
         nFaces          6;
-        startFace       1047820;
+        startFace       986330;
     }
     motorBike_round-dial%43
     {
         type            wall;
-        nFaces          18;
-        startFace       1047826;
+        nFaces          17;
+        startFace       986336;
     }
     motorBike_dial-holder%44
     {
         type            wall;
         nFaces          87;
-        startFace       1047844;
+        startFace       986353;
     }
     motorBike_rear-susp%45
     {
         type            wall;
-        nFaces          1787;
-        startFace       1047931;
+        nFaces          1786;
+        startFace       986440;
     }
     motorBike_rear-brake-lights%46
     {
         type            wall;
         nFaces          54;
-        startFace       1049718;
+        startFace       988226;
     }
     motorBike_rear-light-bracket%47
     {
         type            wall;
         nFaces          163;
-        startFace       1049772;
+        startFace       988280;
     }
     motorBike_frame%48
     {
         type            wall;
         nFaces          2040;
-        startFace       1049935;
+        startFace       988443;
     }
     motorBike_rear-mud-guard%49
     {
         type            wall;
-        nFaces          804;
-        startFace       1051975;
+        nFaces          798;
+        startFace       990483;
     }
     motorBike_rear-susp-spring-damp%50
     {
         type            wall;
-        nFaces          125;
-        startFace       1052779;
+        nFaces          124;
+        startFace       991281;
     }
     motorBike_fairing-inner-plate%51
     {
         type            wall;
         nFaces          446;
-        startFace       1052904;
+        startFace       991405;
     }
     motorBike_clutch-housing%52
     {
         type            wall;
-        nFaces          966;
-        startFace       1053350;
+        nFaces          964;
+        startFace       991851;
     }
     motorBike_radiator%53
     {
         type            wall;
-        nFaces          48;
-        startFace       1054316;
+        nFaces          58;
+        startFace       992815;
     }
     motorBike_water-pipe%54
     {
         type            wall;
         nFaces          103;
-        startFace       1054364;
+        startFace       992873;
     }
     motorBike_water-pump%55
     {
         type            wall;
         nFaces          74;
-        startFace       1054467;
+        startFace       992976;
     }
     motorBike_engine%56
     {
         type            wall;
-        nFaces          2384;
-        startFace       1054541;
+        nFaces          2389;
+        startFace       993050;
     }
     motorBike_rear-shock-link%57
     {
         type            wall;
-        nFaces          29;
-        startFace       1056925;
+        nFaces          28;
+        startFace       995439;
     }
     motorBike_rear-brake-fluid-pot-bracket%58
     {
         type            wall;
         nFaces          59;
-        startFace       1056954;
+        startFace       995467;
     }
     motorBike_rear-brake-fluid-pot%59
     {
         type            wall;
         nFaces          53;
-        startFace       1057013;
+        startFace       995526;
     }
     motorBike_footpeg%60
     {
         type            wall;
         nFaces          87;
-        startFace       1057066;
+        startFace       995579;
     }
     motorBike_rr-wh-chain-hub%61
     {
         type            wall;
-        nFaces          145;
-        startFace       1057153;
+        nFaces          143;
+        startFace       995666;
     }
     motorBike_rear-brake-caliper%62
     {
         type            wall;
         nFaces          142;
-        startFace       1057298;
+        startFace       995809;
     }
     motorBike_rider-helmet%65
     {
         type            wall;
         nFaces          583;
-        startFace       1057440;
+        startFace       995951;
     }
     motorBike_rider-visor%66
     {
         type            wall;
         nFaces          95;
-        startFace       1058023;
+        startFace       996534;
     }
     motorBike_rider-boots%67
     {
         type            wall;
         nFaces          1025;
-        startFace       1058118;
+        startFace       996629;
     }
     motorBike_rider-gloves%68
     {
         type            wall;
         nFaces          320;
-        startFace       1059143;
+        startFace       997654;
     }
     motorBike_rider-body%69
     {
         type            wall;
         nFaces          4555;
-        startFace       1059463;
+        startFace       997974;
     }
     motorBike_frame:0%70
     {
         type            wall;
         nFaces          37;
-        startFace       1064018;
+        startFace       1002529;
     }
     motorBike_frt-fairing:001-shadow%74
     {
         type            wall;
-        nFaces          1274;
-        startFace       1064055;
+        nFaces          1301;
+        startFace       1002566;
     }
     motorBike_windshield-shadow%75
     {
         type            wall;
-        nFaces          101;
-        startFace       1065329;
+        nFaces          97;
+        startFace       1003867;
     }
     motorBike_fr-mud-guard-shadow%81
     {
         type            wall;
-        nFaces          129;
-        startFace       1065430;
+        nFaces          140;
+        startFace       1003964;
     }
     motorBike_fr-wh-brake-disk-shadow%83
     {
         type            wall;
-        nFaces          77;
-        startFace       1065559;
+        nFaces          76;
+        startFace       1004104;
     }
     motorBike_rear-mud-guard-shadow%84
     {
         type            wall;
-        nFaces          138;
-        startFace       1065636;
+        nFaces          137;
+        startFace       1004180;
     }
     motorBike_rear-susp-spring-damp-shadow%85
     {
         type            wall;
         nFaces          15;
-        startFace       1065774;
+        startFace       1004317;
     }
     motorBike_radiator-shadow%86
     {
         type            wall;
-        nFaces          12;
-        startFace       1065789;
+        nFaces          4;
+        startFace       1004332;
     }
     motorBike_rear-shock-link-shadow%87
     {
         type            wall;
-        nFaces          7;
-        startFace       1065801;
+        nFaces          8;
+        startFace       1004336;
     }
     motorBike_rear-brake-fluid-pot-bracket-shadow%88
     {
         type            wall;
-        nFaces          6;
-        startFace       1065808;
+        nFaces          5;
+        startFace       1004344;
     }
     motorBike_rr-wh-chain-hub-shadow%89
     {
         type            wall;
-        nFaces          24;
-        startFace       1065814;
+        nFaces          27;
+        startFace       1004349;
     }
 )
 
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/controlDict b/tutorials/incompressible/simpleFoam/motorBike/system/controlDict
index eeb1d43a1d61d5b1fa3ef6e412db1e46c9bfb639..72478f821e13083be91a965432687694beea94bf 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/controlDict
@@ -18,13 +18,13 @@ libs            ("libincompressibleRASModels.so");
 
 application     simpleFoam;
 
-startFrom       latestTime;
+startFrom       startTime;
 
 startTime       0;
 
 stopAt          endTime;
 
-endTime         500;
+endTime         1000;
 
 deltaT          1;
 
@@ -38,12 +38,12 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression compressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes b/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
index 72974933474f1f84d9bca41ef9f42a67048fd18b..b83088fb0e64278bd1bda4e68c848932038c0bd0 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
@@ -24,7 +24,6 @@ gradSchemes
     default         Gauss linear;
     grad(p)         Gauss linear;
     grad(U)         Gauss linear;
-    //grad(U)         cellLimited Gauss linear 1;
 }
 
 divSchemes
@@ -38,20 +37,17 @@ divSchemes
 
 laplacianSchemes
 {
-    default         Gauss linear corrected;
-    //default         Gauss linear limited 0.5;
-    //default         Gauss linear limited 0.333;
+    default         Gauss linear limited 0.333;
 }
 
 interpolationSchemes
 {
     default         linear;
-    interpolate(U)  linear;
 }
 
 snGradSchemes
 {
-    default         corrected;
+    default         limited 0.333;
 }
 
 fluxRequired
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
index c2f8d5f887dd58a86344bc9a5fecfec66d44efa3..7f1626172b8e484badb25a8c38d99afaafcf46fb 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
@@ -37,46 +37,61 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 functions
-(
+{
+    convergenceChecks
+    {
+        type           residualControl;
+        functionObjectLibs ( "libjobControl.so" );
+        outputControl  timeStep;
+        outputInterval 1;
+
+        maxResiduals
+        {
+            p       1e-2;
+            U       1e-3;
+            "(k|epsilon|omega)" 1e-3;
+        }
+    }
+
     streamLines
     {
-        type streamLine;
+        type            streamLine;
 
         // Where to load it from (if not already in solver)
         functionObjectLibs ("libOpenFOAM.so" "libfieldFunctionObjects.so");
 
         // Output every
-        outputControl outputTime;
-        //outputInterval 10;
+        outputControl   outputTime;
+        // outputInterval 10;
 
-        setFormat vtk;//gnuplot;//xmgr; //raw;  //gnuplot;  //jplot;
+        setFormat       vtk; //gnuplot; //xmgr; //raw; //jplot;
 
         // Velocity field to use for tracking.
         U U;
 
         // Tracked forwards (+U) or backwards (-U)
-        trackForward true;
+        trackForward    true;
 
         // Names of fields to sample. Should contain above velocity field!
         fields (p k U);
 
         // Cells particles can travel before being removed
-        lifeTime 1000;
+        lifeTime        1000;
 
         // Cloud name to use
-        cloudName particleTracks;
+        cloudName       particleTracks;
 
         // Seeding method. See the sampleSets in sampleDict.
-        seedSampleSet uniform;  //cloud;//triSurfaceMeshPointSet;
+        seedSampleSet   uniform;  //cloud;//triSurfaceMeshPointSet;
 
         uniformCoeffs
         {
@@ -87,25 +102,7 @@ functions
             end         (-0.0205 0.0251 0.00001);
             nPoints     10;
         }
-
-//        cloudCoeffs
-//        {
-//            type        cloud;
-//            axis        x;
-//
-//            points
-//            (
-//                (-0.0205936225239282 0.0144729199524163 0.00001)
-//            );
-//        }
-
-//        triSurfaceMeshPointSetCoeffs
-//        {
-//            type        triSurfaceMeshPointSet;
-//            axis        distance;
-//            surface     twoTri.stl;
-//        }
     }
-);
+}
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
index 7bb078570d7cf5d968c57b63ade23521f95272ea..9b2e71312a431324d245eb7a0d323c4687007d8c 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/system/controlDict b/tutorials/incompressible/simpleSRFFoam/mixer/system/controlDict
index cc885d2f1d2bb985d0528bccd7a9929e304375d1..ba975ce4f226a1c97415400ae6cf5adddb29e306 100644
--- a/tutorials/incompressible/simpleSRFFoam/mixer/system/controlDict
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict
index d056865b159cb42067d14d72c02bd5845d8018f3..2ee23fd83a10aa0afa600291d286fdd773950873 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  10;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict
index 76bb2b6b31e46d817e467e36d379f9ef43e4d167..b5f8df21a79c6ef466839f7e58e0e376ba27e218 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  10;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/controlDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/controlDict
index 64c9c37c8d8554bb1edaa163be42ed10b228cc8f..5d37d10cfda9ccf96488592c7012293e8d72223f 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/controlDict
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/controlDict
@@ -35,13 +35,13 @@ writeFormat     ascii;
 
 writePrecision  10;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/controlDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/controlDict
index d31fcef49d8971ddc8034103da5d394d5af7e644..b8bb30c4099a73edcecdd3482e9ccc11449b721e 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/controlDict
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/controlDict
@@ -35,13 +35,13 @@ writeFormat     ascii;
 
 writePrecision  10;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
@@ -63,6 +63,7 @@ functions
         sourceName      outlet;
         operation       weightedAverage;
         weightField     phi;
+
         fields
         (
             H2O
@@ -71,5 +72,4 @@ functions
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/system/controlDict b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/system/controlDict
index 716a16a4c746bae0267001a9fcb5beaadec960aa..334ea705036b2a04ee124d8270fdd44fe1315058 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  10;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/controlDict b/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/controlDict
index 9388ecb3fb3c641b43ff88fa734bb6986257bfc1..2b196db8297221cfa1cea568692c13da7baf1d7a 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  10;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/controlDict
index 0042f56ab858af98bdcaeffd21db37372a3ca74a..acd78c5fec7e6c6aa367f966ebe146a37a71008d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  10;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/controlDict b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/controlDict
index 66ed78d824a0a41925091bdb32d0887487caa824..d8831846bcd6bd1d02632d0c72d529e6ab77be8c 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/controlDict
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  10;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/controlDict b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/controlDict
index e75261300eea7d23841c484858565a65540ae986..2fe8e5ce8f21d1a7c9910a9b250f003b6ce09602 100644
--- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/controlDict
+++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/controlDict b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/controlDict
index afa89fb1332d3b973b4cb60d5b1d2543236fb62f..90c84c37bd0384b3f3564c5a1bf6e1be5de35851 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
index 72db9f8a33d22de6cf8751b68f222e310088e124..f39b9c294f631c848737ece767c7a5c5dc0f57f4 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     binary;
 
 writePrecision  6;
 
-writeCompression compressed;
+writeCompression off;
 
 timeFormat      general;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
-adjustTimeStep  on;
+adjustTimeStep  yes;
 
 maxCo           0.5;
 
@@ -57,6 +57,7 @@ functions
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         enabled         false;
         outputControl   outputTime;
+
         fields
         (
             U
@@ -83,5 +84,4 @@ functions
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
index 37b2b36fb4d709ad5f6ebd50c0104fa9d9c532cc..0dc91c672bfc3e50d37e0d4b52ab8fc6132c713f 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     binary;
 
 writePrecision  6;
 
-writeCompression compressed;
+writeCompression off;
 
 timeFormat      general;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
-adjustTimeStep  on;
+adjustTimeStep  yes;
 
 maxCo           0.5;
 
@@ -57,6 +57,7 @@ functions
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         enabled         false;
         outputControl   outputTime;
+
         fields
         (
             U
@@ -83,5 +84,4 @@ functions
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict
index 3b505dc3eee14ef58b403af5b36ff56d1d7cef1b..8ff1145ed4389797f4a07686aee457751e464a9e 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
-adjustTimeStep  on;
+adjustTimeStep  yes;
 
 maxCo           0.5;
 
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/controlDict b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/controlDict
index 6037f2ab1be15089d254b3e44cfbe2dcdca211ad..03d21ada4bc71b7e85a7e3596042ffcb45048c30 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/controlDict
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  8;
 
-writeCompression compressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   10;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/controlDict b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/controlDict
index 6037f2ab1be15089d254b3e44cfbe2dcdca211ad..03d21ada4bc71b7e85a7e3596042ffcb45048c30 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/controlDict
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  8;
 
-writeCompression compressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   10;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/controlDict
index 86169f2135cd2eca962b7baac21c6c0d8dc08c18..7be42fc88c15ee1aabc0aa4a77cbc9c1529ae954 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/controlDict
index b58fa81303956c132a65f5e2a572a2fb6a71f754..7cb0f3acbac9c0a3efa196e0cfab4cff81728fd7 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  12;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
index af10b7080bf8da27448767061a40dee8cd3efada..f826ebd75780676566bc2acf7a13f3f8e3b32b5e 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression compressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
@@ -59,15 +59,17 @@ functions
         functionObjectLibs ("libsampling.so");
         outputControl   timeStep;
         outputInterval  1;
+
+        fields
+        (
+            p
+        );
+
         probeLocations
         (
             ( 0 9.95 19.77 )
             ( 0 -9.95 19.77 )
         );
-        fields
-        (
-            p
-        );
     }
 
     wallPressure
@@ -77,6 +79,7 @@ functions
         outputControl   timeStep;
         outputInterval  10;
         surfaceFormat   raw;
+
         fields
         (
             p
@@ -94,5 +97,4 @@ functions
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
index af10b7080bf8da27448767061a40dee8cd3efada..2f82526c4e5f3c68ec1a1c91592f43cf9bd196e6 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression compressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
@@ -59,24 +59,27 @@ functions
         functionObjectLibs ("libsampling.so");
         outputControl   timeStep;
         outputInterval  1;
+
+        fields
+        (
+            p
+        );
+
         probeLocations
         (
             ( 0 9.95 19.77 )
             ( 0 -9.95 19.77 )
         );
-        fields
-        (
-            p
-        );
     }
 
     wallPressure
     {
         type            surfaces;
-        functionObjectLibs ("libsampling.so");
         outputControl   timeStep;
         outputInterval  10;
         surfaceFormat   raw;
+        functionObjectLibs ("libsampling.so");
+
         fields
         (
             p
@@ -94,5 +97,4 @@ functions
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
index 12fcd77c422a5bcd38df367c775b64550c470bfb..996904416fa3d4e702ccffb59b3cabab33b90eba 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression compressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
@@ -59,17 +59,18 @@ functions
         functionObjectLibs ("libsampling.so");
         outputControl   timeStep;
         outputInterval  1;
+
+        fields
+        (
+            p
+        );
+
         probeLocations
         (
             ( 0 9.95 19.77 )
             ( 0 -9.95 19.77 )
         );
-        fields
-        (
-            p
-        );
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict
index 12fcd77c422a5bcd38df367c775b64550c470bfb..996904416fa3d4e702ccffb59b3cabab33b90eba 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression compressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
@@ -59,17 +59,18 @@ functions
         functionObjectLibs ("libsampling.so");
         outputControl   timeStep;
         outputInterval  1;
+
+        fields
+        (
+            p
+        );
+
         probeLocations
         (
             ( 0 9.95 19.77 )
             ( 0 -9.95 19.77 )
         );
-        fields
-        (
-            p
-        );
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict
index 12fcd77c422a5bcd38df367c775b64550c470bfb..996904416fa3d4e702ccffb59b3cabab33b90eba 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression compressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
@@ -59,17 +59,18 @@ functions
         functionObjectLibs ("libsampling.so");
         outputControl   timeStep;
         outputInterval  1;
+
+        fields
+        (
+            p
+        );
+
         probeLocations
         (
             ( 0 9.95 19.77 )
             ( 0 -9.95 19.77 )
         );
-        fields
-        (
-            p
-        );
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/controlDict
index 8c4c00f816fdd2d5b610dd310ddd0cd0ef453b77..a1010335eaf9b9208d9319453ceeed67c2201761 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression compressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/controlDict b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/controlDict
index 8360e0fd1c32fe7704e39a32e6a55270853c054c..f666f4e3869f56230e8337b3cab91e1513b69903 100644
--- a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/controlDict
+++ b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict b/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict
index 27a45f95559c643f71050c98991a0de0bf970a2e..aaf742a02c024eb440a5b97d611880cea206fb93 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/controlDict b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/controlDict
index ad766b12a95906536b7e8e92fb01b74d8a4ac2e0..3100d3b915ac9fbf5e54a4f44756a7c945b12758 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/controlDict
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  8;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/controlDict b/tutorials/multiphase/interFoam/ras/damBreak/system/controlDict
index cee98fd45576d15dedf563d01608ac2044aa9f14..4ddbc2e00b2ec70088129d6cdd27e421e692aa94 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/system/controlDict
+++ b/tutorials/multiphase/interFoam/ras/damBreak/system/controlDict
@@ -37,15 +37,15 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
-adjustTimeStep  on;
+adjustTimeStep  yes;
 
 maxCo           0.2;
 
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/controlDict b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/controlDict
index a6f556508b1043f8de1653b692df0c37a7050d82..0290419bea7acc605390d78200cfda8109869166 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/controlDict
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression compressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/controlDict b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/controlDict
index 8be2ec910a96315044e6acbd6c38c8ca981df6f4..6262dc6bdea78f8d70b7fefa82aa9007334b9e04 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/controlDict
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/controlDict
@@ -14,37 +14,36 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application                interPhaseChangeFoam;
+application     interPhaseChangeFoam;
 
-startFrom                  latestTime;
+startFrom       latestTime;
 
-startTime                  0;
+startTime       0;
 
-stopAt                     endTime;
+stopAt          endTime;
 
-endTime                    0.05;
+endTime         0.05;
 
-deltaT                     1e-8;
+deltaT          1e-8;
 
-writeControl               adjustableRunTime;
+writeControl    adjustableRunTime;
 
-writeInterval              0.001;
+writeInterval   0.001;
 
-purgeWrite                 0;
+purgeWrite      0;
 
-writeFormat                ascii;
+writeFormat     ascii;
 
-writePrecision             6;
+writePrecision  6;
 
-writeCompression           uncompressed;
+writeCompression off;
 
-timeFormat                 general;
+timeFormat      general;
 
-runTimeModifiable          yes;
+runTimeModifiable true;
 
-adjustTimeStep             on;
-
-maxCo                      1.0;
+adjustTimeStep  yes;
 
+maxCo           1.0;
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict
index c945fe73bf2ab732a4cb9806e9843652502abb7b..3e99c4a69cb6c591e5c2a89c14079bd1243836b0 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict
index c945fe73bf2ab732a4cb9806e9843652502abb7b..3e99c4a69cb6c591e5c2a89c14079bd1243836b0 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/system/controlDict b/tutorials/multiphase/settlingFoam/ras/dahl/system/controlDict
index ef409e071a4e9a67a9c895e574cebfc3b3bac40d..3a40815c14a9e3052aaade0e3da77ef980202990 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/system/controlDict
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/system/controlDict b/tutorials/multiphase/settlingFoam/ras/tank3D/system/controlDict
index b6d0e5c258d1a5c48d72143679dc5da929ad9d4a..b81abb5a4f826eb7c1f03e3b9e5a1273b3b526a1 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/system/controlDict
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression compressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict
index 0fcde57ac55cf85703440cfe926e2ec4b36f6c7b..1e206833e2b1bd0b0bdf5b2bbb605e2ddb5224fc 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     binary;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable on;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
@@ -58,38 +58,38 @@ functions
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         outputControl   outputTime;
+
         fields
         (
             Ua
             {
-                 mean        on;
-                 prime2Mean  off;
-                 base        time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
 
             Ub
             {
-                 mean        on;
-                 prime2Mean  off;
-                 base        time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
 
             alpha
             {
-                 mean        on;
-                 prime2Mean  off;
-                 base        time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
 
             p
             {
-                 mean        on;
-                 prime2Mean  off;
-                 base        time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
         );
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict
index a9f783f78a79a7ff6d32ff9d77d41b1aab517218..0319c356ca4c0f1601fb1f918525150258938957 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable on;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
@@ -58,38 +58,38 @@ functions
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         outputControl   outputTime;
+
         fields
         (
             Ua
             {
-                 mean        on;
-                 prime2Mean  off;
-                 base        time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
 
             Ub
             {
-                 mean        on;
-                 prime2Mean  off;
-                 base        time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
 
             alpha
             {
-                 mean        on;
-                 prime2Mean  off;
-                 base        time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
 
             p
             {
-                 mean        on;
-                 prime2Mean  off;
-                 base        time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
         );
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict
index 14d31e3a80cba335ffc169e1776eaeab0e1806bb..4a5f547a9b782800f0d36018883995560396a1e2 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
@@ -58,38 +58,38 @@ functions
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         outputControl   outputTime;
+
         fields
         (
             Ua
             {
-                 mean        on;
-                 prime2Mean  off;
-                 base        time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
 
             Ub
             {
-                 mean        on;
-                 prime2Mean  off;
-                 base        time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
 
             alpha
             {
-                 mean        on;
-                 prime2Mean  off;
-                 base        time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
 
             p
             {
-                 mean        on;
-                 prime2Mean  off;
-                 base        time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
         );
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/controlDict b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/controlDict
index b808ad26924b856d24fe8511513002128ea97621..ffee5741cb142f7e037bda8143ca9e66b967a077 100644
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/controlDict
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/controlDict
@@ -37,7 +37,7 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
@@ -45,7 +45,7 @@ timePrecision   6;
 
 graphFormat     raw;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict
index 473dcfc797837dbaf7e983dff571d7665eb109e3..daa78b5501b0187bca98150d882a5da62c7cc7b6 100644
--- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict
@@ -35,13 +35,13 @@ purgeWrite      0;
 
 writeFormat     ascii;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict.org b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict.org
index b11b030388db2f71b9fe9393a7cfa214f8e097de..70ff5e211053208c6df75a14ef7ba20ab8ad302e 100644
--- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict.org
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict.org
@@ -33,13 +33,13 @@ purgeWrite      0;
 
 writeFormat     ascii;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //