diff --git a/index.js b/index.js
index 1f1cbfe..df688f8 100644
--- a/index.js
+++ b/index.js
@@ -9,7 +9,6 @@ const pg = require('pg');
 
 //---------read sql files into variables----------------
 var fs = require('fs');
-var readline = require('readline');
 //-------------------------------------------------------
 
 var options = {
@@ -19,7 +18,7 @@ var options = {
 };
 
 https.createServer(options, server).listen(process.env.nodeport, () => {
-    console.log('started on ' + process.env.nodeport)
+    console.log(`${new Date().toISOString()}: Web service started on port ${process.env.nodeport}`)
 });
 
 var Postgres = new pg.Client({
@@ -33,31 +32,33 @@ var Postgres = new pg.Client({
 });
 Postgres.connect();
 
-Postgres.FirstRow = function(inSQL, args, inResponse) {
-    Postgres.query(inSQL, args, (err, res) => {
+Postgres.FirstRow = function(inSQL, inResponse) {
+    console.log(`${new Date().toISOString()}: Running query:\n${inSQL}`);
+    Postgres.query(inSQL, [], (err, res) => {
         if (err === null) {
+            console.log(`${new Date().toISOString()}: Received reponse: ${JSON.stringify(res.rows[0]).slice(0,100)}…`);
             inResponse.json(res.rows[0]);
             return;
         }
-        console.log(err.stack);
+        console.log(`${new Date().toISOString()}: ${JSON.stringify(err.stack)}`);
         inResponse.json(err.stack);
     });
 };
 
-server.get('/', function(req, res) {
-    console.log(`${new Date().toISOString()}: GET /  (Test if server is up.)... SQL: n/a ${"-._.".repeat(20)}`);
+server.get('/', function(_, res) {
+    console.log(`${new Date().toISOString()}: GET /  (Test if server is up.)… SQL: n/a ${"-._.".repeat(20)}`);
     res.send('node.js express is up and running');
 });
 
-server.get('/login', (req, res) => res.sendFile(process.env.wd + 'msauth.html'))
+server.get('/login', (_, res) => res.sendFile(process.env.wd + 'msauth.html'))
 
-server.get('/logs', (req, res) => res.sendFile(process.env.wd + 'changes.log'))
+server.get('/logs', (_, res) => res.sendFile(process.env.wd + 'changes.log'))
 
-server.get('/pgbadger', (req, res) => res.sendFile(process.env.wd + 'logs.html'))
+server.get('/pgbadger', (_, res) => res.sendFile(process.env.wd + 'logs.html'))
 
-server.get('/totals', (req, res) => res.sendFile(process.env.wd + 'totals.log'))
+server.get('/totals', (_, res) => res.sendFile(process.env.wd + 'totals.log'))
 
-server.get('/test_sql', function(req, res) {
+server.get('/test_sql', function(_, res) {
     var path = './route_meta/scenario_package.sql'
     var callback = function(arg) {
         res.send(arg)
@@ -67,48 +68,40 @@ server.get('/test_sql', function(req, res) {
         if (!err) {
             callback(data);
         } else {
-            callback(err);
+            res.send('Failed to read needed SQL file.');
         }
     });
 });
 
 server.get('/get_pool', bodyParser.json(), function(req, res) {
 
-    var sql = "";
-    var w = "";
-    var c = 1;
-    var d = 1;
-    var args = [];
     var path = './route_sql/get_pool.sql';
-    console.log(`${new Date().toISOString()}: GET /get_pool  (Get all data for one DSM.)... SQL: ${path} ${"-._.".repeat(20)}`);
+    console.log(`${new Date().toISOString()}: GET /get_pool  (Get all data for one DSM.)… SQL: ${path} ${"-._.".repeat(20)}`);
 
     var callback = function(arg) {
-        sql = arg;
 
         if (req.body.quota_rep) {
             // ensure backward compatibility
-            console.log('Converting old format...', req.body);
+            console.log(`${new Date().toISOString()}:Converting old format… ${JSON.stringify(req.body)}`);
             req.body = {'scenario':{'quota_rep_descr':req.body.quota_rep}};
         }
 
-        ({ c, w, d } = build_where(req, c, w, d, args));
-
-        if (c == 1) {
+        var where = build_where(req);
+        if (where === '') {
             res.send("no body was sent");
             return;
         }
-        console.log(req.body);
-        sql = sql.replace(new RegExp("where_clause", 'g'), w);
-        console.log(sql);
-        Postgres.FirstRow(sql, [], res)
+
+        var sql = arg.replace(new RegExp("where_clause", 'g'), where);
+        Postgres.FirstRow(sql, res)
     };
 
     fs.readFile(path, 'utf8', function(err, data) {
         if (!err) {
             callback(data);
         } else {
-            console.log("fatal error pulling sql file")
-            callback(err);
+            console.log(`${new Date().toISOString()}: error reading sql file: ${JSON.stringify(err)}`);
+            res.send('Failed to read needed SQL file.');
         }
     });
 
@@ -116,229 +109,158 @@ server.get('/get_pool', bodyParser.json(), function(req, res) {
 
 server.get('/scenario_package', bodyParser.json(), function(req, res) {
 
-    var sql = "";
-    var w = "";
-    var c = 1;
-    var d = 1;
-    var args = [];
     var path = './route_sql/scenario_package.sql';
-    console.log(`${new Date().toISOString()}: GET /scenario_package  (Get all data for a given scenario)... SQL: ${path} ${"-._.".repeat(20)}`)
+    console.log(`${new Date().toISOString()}: GET /scenario_package  (Get all data for a given scenario)… SQL: ${path} ${"-._.".repeat(20)}`)
 
     fs.readFile(path, 'utf8', function(err, data) {
         if (!err) {
             callback(data);
         } else {
-            console.log("fatal error pulling sql file")
-            callback(err);
+            console.log(`${new Date().toISOString()}: error reading sql file: ${JSON.stringify(err)}`);
+            res.send('Failed to read needed SQL file.');
         }
     });
 
     var callback = function(arg) {
-        sql = arg;
-
-        //parse request body into a where clause
-        ({ c, w, d } = build_where(req, c, w, d, args));
-
-        //if there was no body sent, return with nothing
-        if (c == 1) {
+        var where = build_where(req);
+        if (where === '') {
             res.send("no body was sent");
             return;
         }
-        console.log(req.body);
-        //parse the where clause into the main sql statement
-        sql = sql.replace(new RegExp("where_clause", 'g'), w)
-            //execute the sql and send the result
-        console.log(sql);
-        Postgres.FirstRow(sql, [], res)
+
+        var sql = arg.replace(new RegExp("where_clause", 'g'), where)
+        Postgres.FirstRow(sql, res)
     };
 })
 
 server.get('/swap_fit', bodyParser.json(), function(req, res) {
 
-    var sql = "";
-    var w = "";
-    var c = 1;
-    var d = 1;
-    var args = [];
     var path = './route_sql/swap_fit.sql';
-    console.log(`${new Date().toISOString()}: GET /swap_fit  (Obsolete.)... SQL: ${path} ${"-._.".repeat(20)}`)
+    console.log(`${new Date().toISOString()}: GET /swap_fit  (Obsolete.)… SQL: ${path} ${"-._.".repeat(20)}`)
 
     fs.readFile(path, 'utf8', function(err, data) {
         if (!err) {
             callback(data);
         } else {
-            console.log("fatal error pulling sql file")
-            callback(err);
+            console.log(`${new Date().toISOString()}: error reading sql file: ${JSON.stringify(err)}`);
+            res.send('Failed to read needed SQL file.');
         }
     });
 
     var callback = function(arg) {
-        sql = arg;
-
-        //parse request body into a where clause
-        ({ c, w, d } = build_where(req, c, w, d, args));
-
-        //if there was no body sent, return with nothing
-        if (c == 1) {
+        var where = build_where(req);
+        if (where === '') {
             res.send("no body was sent");
             return;
         }
-        console.log(req.body);
-        //parse the where clause into the main sql statement
-        sql = sql.replace(new RegExp("where_clause", 'g'), w);
+        var sql = arg.replace(new RegExp("where_clause", 'g'), where);
         sql = sql.replace(new RegExp("replace_new_mold", 'g'), req.body.new_mold);
-        //execute the sql and send the result
-        console.log(sql);
-        Postgres.FirstRow(sql, [], res)
+        Postgres.FirstRow(sql, res)
     };
 })
 
 server.post('/swap', bodyParser.json(), function(req, res) {
 
-    var sql = "";
-    var w = "";
-    var c = 1;
-    var d = 1;
-    var args = [];
     var path = './route_sql/swap_post.sql';
-    console.log(`${new Date().toISOString()}: POST /swap  (Obsolete.)... SQL: ${path} ${"-._.".repeat(20)}`)
+    console.log(`${new Date().toISOString()}: POST /swap  (Obsolete.)… SQL: ${path} ${"-._.".repeat(20)}`)
 
     fs.readFile(path, 'utf8', function(err, data) {
         if (!err) {
             callback(data);
         } else {
-            console.log("fatal error pulling sql file")
-            callback(err);
+            console.log(`${new Date().toISOString()}: error reading sql file: ${JSON.stringify(err)}`);
+            res.send('Failed to read needed SQL file.');
         }
     });
 
     var callback = function(arg) {
-        sql = arg;
-
-        //parse request body into a where clause
-        ({ c, w, d } = build_where(req, c, w, d, args));
-
-        //if there was no body sent, return with nothing
-        if (c == 1) {
+        var where = build_where(req);
+        if (where === '') {
             res.send("no body was sent");
             return;
         }
-        console.log(req.body);
-        //parse the where clause into the main sql statement
-        sql = sql.replace(new RegExp("where_clause", 'g'), w);
+        var sql = arg.replace(new RegExp("where_clause", 'g'), where);
         sql = sql.replace(new RegExp("swap_doc", 'g'), JSON.stringify(req.body.swap));
         sql = sql.replace(new RegExp("replace_version", 'g'), req.body.scenario.version);
         sql = sql.replace(new RegExp("replace_source", 'g'), req.body.source);
         sql = sql.replace(new RegExp("replace_iterdef", 'g'), JSON.stringify(req.body));
-        //execute the sql and send the result
-        console.log(sql);
-        Postgres.FirstRow(sql, [], res)
+        Postgres.FirstRow(sql, res)
     };
 })
 
 server.post('/cust_swap', bodyParser.json(), function(req, res) {
 
-    var sql = "";
-    var w = "";
-    var c = 1;
-    var d = 1;
-    var args = [];
     var path = './route_sql/swap_cust.sql';
-    console.log(`${new Date().toISOString()}: POST /cust_swap  (Obsolete.)... SQL: ${path} ${"-._.".repeat(20)}`)
+    console.log(`${new Date().toISOString()}: POST /cust_swap  (Obsolete.)… SQL: ${path} ${"-._.".repeat(20)}`)
 
     fs.readFile(path, 'utf8', function(err, data) {
         if (!err) {
             callback(data);
         } else {
-            console.log("fatal error pulling sql file")
-            callback(err);
+            console.log(`${new Date().toISOString()}: error reading sql file: ${JSON.stringify(err)}`);
+            res.send('Failed to read needed SQL file.');
         }
     });
 
     var callback = function(arg) {
-        sql = arg;
-
-        //parse request body into a where clause
-        ({ c, w, d } = build_where(req, c, w, d, args));
-
-        //if there was no body sent, return with nothing
-        if (c == 1) {
+        var where = build_where(req);
+        if (where === '') {
             res.send("no body was sent");
             return;
         }
-        console.log(req.body);
-        //parse the where clause into the main sql statement
-        sql = sql.replace(new RegExp("where_clause", 'g'), w);
+
+        var sql = arg.replace(new RegExp("where_clause", 'g'), where);
         sql = sql.replace(new RegExp("swap_doc", 'g'), JSON.stringify(req.body.swap));
         sql = sql.replace(new RegExp("replace_version", 'g'), req.body.scenario.version);
         sql = sql.replace(new RegExp("replace_source", 'g'), req.body.source);
         sql = sql.replace(new RegExp("replace_iterdef", 'g'), JSON.stringify(req.body));
-        //execute the sql and send the result
-        console.log(sql);
-        //res.json(null);
-        Postgres.FirstRow(sql, [], res)
+        Postgres.FirstRow(sql, res)
     };
 })
 
 server.get('/list_changes', bodyParser.json(), function(req, res) {
 
-    var sql = "";
-    var w = "";
-    var c = 1;
-    var d = 1;
-    var args = [];
     var path = './route_sql/list_changes.sql';
-    console.log(`${new Date().toISOString()}: GET /list_changes  (Get a list of adjustments made to DSM's pool.)... SQL: ${path} ${"-._.".repeat(20)}`)
+    console.log(`${new Date().toISOString()}: GET /list_changes  (Get a list of adjustments made to DSM's pool.)… SQL: ${path} ${"-._.".repeat(20)}`)
 
     fs.readFile(path, 'utf8', function(err, data) {
         if (!err) {
             callback(data);
         } else {
-            console.log("fatal error pulling sql file")
-            callback(err);
+            console.log(`${new Date().toISOString()}: error reading sql file: ${JSON.stringify(err)}`);
+            res.send('Failed to read needed SQL file.');
         }
     });
 
     var callback = function(arg) {
-        sql = arg;
+        var where = build_where(req);
+        if (where === '') {
+            res.send("no body was sent");
+            return;
+        }
 
-        console.log(req.body);
-        //parse the where clause into the main sql statement
-        sql = sql.replace(new RegExp("replace_user", 'g'), req.body.scenario.quota_rep_descr)
-        //execute the sql and send the result
-        console.log(sql);
-        Postgres.FirstRow(sql, [], res)
+        var sql = arg.replace(new RegExp("where_clause", 'g'), where);
+        Postgres.FirstRow(sql, res)
     };
 })
 
 server.get('/undo_change', bodyParser.json(), function(req, res) {
 
-    var sql = "";
-    var w = "";
-    var c = 1;
-    var d = 1;
-    var args = [];
     var path = './route_sql/undo.sql';
-    console.log(`${new Date().toISOString()}: GET /undo_change  (Remove an adjustment from the DSM's pool.)... SQL: ${path} ${"-._.".repeat(20)}`)
+    console.log(`${new Date().toISOString()}: GET /undo_change  (Remove an adjustment from the DSM's pool.)… SQL: ${path} ${"-._.".repeat(20)}`)
 
     fs.readFile(path, 'utf8', function(err, data) {
         if (!err) {
             callback(data);
         } else {
-            console.log("fatal error pulling sql file")
-            callback(err);
+            console.log(`${new Date().toISOString()}: error reading sql file: ${JSON.stringify(err)}`);
+            res.send('Failed to read needed SQL file.');
         }
     });
 
     var callback = function(arg) {
-        sql = arg;
-
-        console.log(req.body);
-        //parse the where clause into the main sql statement
-        sql = sql.replace(new RegExp("replace_id", 'g'), JSON.stringify(req.body.logid))
-            //execute the sql and send the result
-        console.log(sql);
-        Postgres.FirstRow(sql, [], res)
+        var sql = arg.replace(new RegExp("replace_id", 'g'), JSON.stringify(req.body.logid))
+        Postgres.FirstRow(sql, res)
     };
 })
 
@@ -346,375 +268,299 @@ server.get('/undo_change', bodyParser.json(), function(req, res) {
 /*
 server.post('/addmonth_v', bodyParser.json(), function(req, res) {
 
-    var sql = "";
-    var w = "";
-    var c = 1; //counts iterations through each scaenario key
-    var d = 1; //counts cycles in scenario key values which are arrays
-    var args = [];
     var path = './route_sql/addmonth_vd.sql';
-    console.log(`${new Date().toISOString()}: POST /add_month_v  (Obsolete.)... SQL: ${path} ${"-._.".repeat(20)}`);
+    console.log(`${new Date().toISOString()}: POST /add_month_v  (Obsolete.)… SQL: ${path} ${"-._.".repeat(20)}`);
 
     fs.readFile(path, 'utf8', function(err, data) {
         if (!err) {
             callback(data);
         } else {
-            console.log("fatal error pulling sql file")
-            callback(err);
+            console.log(`${new Date().toISOString()}: error reading sql file: ${JSON.stringify(err)}`);
+            res.send('Failed to read needed SQL file.');
         }
     });
 
     var callback = function(arg) {
-        sql = arg;
-        //buile where clause expression
-        ({ c, w, d } = build_where(req, c, w, d, args));
-
-        if (c == 1) {
+        var where = build_where(req);
+        if (where === '') {
             res.send("no body was sent");
             return;
         }
+
         req.body.stamp = new Date().toISOString()
-        console.log(req.body);
-        //console.log(args);
-        sql = sql.replace(new RegExp("scenario = target_scenario", 'g'), w);
+        var sql = arg.replace(new RegExp("scenario = target_scenario", 'g'), where);
         sql = sql.replace(new RegExp("target_increment", 'g'), req.body.qty);
         sql = sql.replace(new RegExp("target_month", 'g'), req.body.month);
         sql = sql.replace(new RegExp("replace_version", 'g'), req.body.scenario.version);
         sql = sql.replace(new RegExp("replace_source", 'g'), req.body.source);
         sql = sql.replace(new RegExp("replace_iterdef", 'g'), JSON.stringify(req.body));
-        console.log(sql)
-        Postgres.FirstRow(sql, [], res)
+        Postgres.FirstRow(sql, res)
     }
 })
 */
 
 server.post('/addmonth_vp', bodyParser.json(), function(req, res) {
 
-    var sql = "";
-    var w = "";
-    var c = 1;
-    var d = 1;
-    var args = [];
     var path = './route_sql/addmonth_vupd.sql';
-    console.log(`${new Date().toISOString()}: POST /add_month_vp  (Add volume and pricing for a new month in the forecast.)... SQL: ${path} ${"-._.".repeat(20)}`);
+    console.log(`${new Date().toISOString()}: POST /add_month_vp  (Add volume and pricing for a new month in the forecast.)… SQL: ${path} ${"-._.".repeat(20)}`);
 
     var callback = function(arg) {
-        sql = arg;
-
-        ({ c, w, d } = build_where(req, c, w, d, args));
-
-        if (c == 1) {
+        var where = build_where(req);
+        if (where === '') {
             res.send("no body was sent");
             return;
         }
+
         req.body.stamp = new Date().toISOString()
-        console.log(req.body);
-        //console.log(args);
-        sql = sql.replace(new RegExp("where_clause", 'g'), w);
+        var sql = arg.replace(new RegExp("where_clause", 'g'), where);
         sql = sql.replace(new RegExp("target_volume", 'g'), req.body.qty);
         sql = sql.replace(new RegExp("target_price", 'g'), req.body.amount);
         sql = sql.replace(new RegExp("target_month", 'g'), req.body.month);
         sql = sql.replace(new RegExp("replace_version", 'g'), req.body.scenario.version);
         sql = sql.replace(new RegExp("replace_source", 'g'), req.body.source);
         sql = sql.replace(new RegExp("replace_iterdef", 'g'), JSON.stringify(req.body));
-        console.log(sql);
-        Postgres.FirstRow(sql, [], res)
+        Postgres.FirstRow(sql, res)
     }
 
     fs.readFile(path, 'utf8', function(err, data) {
         if (!err) {
             callback(data);
         } else {
-            console.log("fatal error pulling sql file")
-            callback(err);
+            console.log(`${new Date().toISOString()}: error reading sql file: ${JSON.stringify(err)}`);
+            res.send('Failed to read needed SQL file.');
         }
     });
 })
 
 server.post('/scale_v', bodyParser.json(), function(req, res) {
 
-    var sql = "";
-    var w = "";
-    var c = 1;
-    var d = 1;
-    var args = [];
     var path = './route_sql/scale_vd.sql';
-    console.log(`${new Date().toISOString()}: POST /scale_v  (Scale the volume for the given scenario.)... SQL: ${path} ${"-._.".repeat(20)}`);
+    console.log(`${new Date().toISOString()}: POST /scale_v  (Scale the volume for the given scenario.)… SQL: ${path} ${"-._.".repeat(20)}`);
 
     var callback = function(arg) {
-        sql = arg;
-
-        ({ c, w, d } = build_where(req, c, w, d, args));
-
-        if (c == 1) {
+        var where = build_where(req);
+        if (where === '') {
             res.send("no body was sent");
             return;
         }
+
         req.body.stamp = new Date().toISOString()
-        console.log(req.body);
-        //console.log(args);
-        sql = sql.replace(new RegExp("where_clause", 'g'), w);
+        var sql = arg.replace(new RegExp("where_clause", 'g'), where);
         sql = sql.replace(new RegExp("incr_qty", 'g'), req.body.qty);
         sql = sql.replace(new RegExp("replace_version", 'g'), req.body.scenario.version);
         sql = sql.replace(new RegExp("replace_source", 'g'), req.body.source);
         sql = sql.replace(new RegExp("replace_iterdef", 'g'), JSON.stringify(req.body));
-        console.log(sql);
-        Postgres.FirstRow(sql, [], res)
+        Postgres.FirstRow(sql, res)
     }
 
     fs.readFile(path, 'utf8', function(err, data) {
         if (!err) {
             callback(data);
         } else {
-            console.log("fatal error pulling sql file")
-            callback(err);
+            console.log(`${new Date().toISOString()}: error reading sql file: ${JSON.stringify(err)}`);
+            res.send('Failed to read needed SQL file.');
         }
     });
 })
 
 server.post('/scale_p', bodyParser.json(), function(req, res) {
 
-    var sql = "";
-    var w = "";
-    var c = 1;
-    var d = 1;
-    var args = [];
     var path = './route_sql/scale_pd.sql';
-    console.log(`${new Date().toISOString()}: POST /scale_p  (Scale price for the given scenario.)... SQL: ${path} ${"-._.".repeat(20)}`);
+    console.log(`${new Date().toISOString()}: POST /scale_p  (Scale price for the given scenario.)… SQL: ${path} ${"-._.".repeat(20)}`);
 
     var callback = function(arg) {
-        sql = arg;
-
-        ({ c, w, d } = build_where(req, c, w, d, args));
-
-        if (c == 1) {
+        var where = build_where(req);
+        if (where === '') {
             res.send("no body was sent");
             return;
         }
+
         req.body.stamp = new Date().toISOString()
-        console.log(req.body);
-        //console.log(args);
-        sql = sql.replace(new RegExp("where_clause", 'g'), w);
+        var sql = arg.replace(new RegExp("where_clause", 'g'), where);
         sql = sql.replace(new RegExp("target_increment", 'g'), req.body.amount);
         sql = sql.replace(new RegExp("replace_version", 'g'), req.body.scenario.version);
         sql = sql.replace(new RegExp("replace_source", 'g'), req.body.source);
         sql = sql.replace(new RegExp("replace_iterdef", 'g'), JSON.stringify(req.body));
-        console.log(sql);
-        Postgres.FirstRow(sql, [], res)
+        Postgres.FirstRow(sql, res)
     }
 
     fs.readFile(path, 'utf8', function(err, data) {
         if (!err) {
             callback(data);
         } else {
-            console.log("fatal error pulling sql file")
-            callback(err);
+            console.log(`${new Date().toISOString()}: error reading sql file: ${JSON.stringify(err)}`);
+            res.send('Failed to read needed SQL file.');
         }
     });
 })
 
 server.post('/scale_vp', bodyParser.json(), function(req, res) {
 
-    var sql = "";
-    var w = "";
-    var c = 1;
-    var d = 1;
-    var args = [];
     var path = './route_sql/scale_vupd.sql';
-    console.log(`${new Date().toISOString()}: POST /scale_vp  (Scale volume and price for the given scenario.)... SQL: ${path} ${"-._.".repeat(20)}`);
+    console.log(`${new Date().toISOString()}: POST /scale_vp  (Scale volume and price for the given scenario.)… SQL: ${path} ${"-._.".repeat(20)}`);
 
     var callback = function(arg) {
-        sql = arg;
-
-        ({ c, w, d } = build_where(req, c, w, d, args));
-
-        if (c == 1) {
+        var where = build_where(req);
+        if (where === '') {
             res.send("no body was sent");
             return;
         }
+
         req.body.stamp = new Date().toISOString()
-        console.log(req.body);
-        //console.log(args);
-        sql = sql.replace(new RegExp("where_clause", 'g'), w);
+        var sql = arg.replace(new RegExp("where_clause", 'g'), where);
         sql = sql.replace(new RegExp("target_vol", 'g'), req.body.qty);
         sql = sql.replace(new RegExp("target_prc", 'g'), req.body.amount);
         sql = sql.replace(new RegExp("replace_version", 'g'), req.body.scenario.version);
         sql = sql.replace(new RegExp("replace_source", 'g'), req.body.source);
         sql = sql.replace(new RegExp("replace_iterdef", 'g'), JSON.stringify(req.body));
-        console.log(sql);
-        Postgres.FirstRow(sql, [], res)
+        Postgres.FirstRow(sql, res)
     }
 
     fs.readFile(path, 'utf8', function(err, data) {
         if (!err) {
             callback(data);
         } else {
-            console.log("fatal error pulling sql file")
-            callback(err);
+            console.log(`${new Date().toISOString()}: error reading sql file: ${JSON.stringify(err)}`);
+            res.send('Failed to read needed SQL file.');
         }
     });
 })
 
 server.post('/scale_vp_sales', bodyParser.json(), function(req, res) {
 
-    var sql = "";
-    var w = "";
-    var c = 1;
-    var d = 1;
-    var args = [];
     var path = './route_sql/scale_vupd.sql';
-    console.log(`${new Date().toISOString()}: POST /scale_vp_sales  (Obsolete.)... SQL: ${path} ${"-._.".repeat(20)}`);
+    console.log(`${new Date().toISOString()}: POST /scale_vp_sales  (Obsolete.)… SQL: ${path} ${"-._.".repeat(20)}`);
 
     var callback = function(arg) {
-        sql = arg;
-
-        ({ c, w, d } = build_where(req, c, w, d, args));
-
-        if (c == 1) {
+        var where = build_where(req);
+        if (where === '') {
             res.send("no body was sent");
             return;
         }
+
         req.body.stamp = new Date().toISOString()
-        console.log(req.body);
-        //console.log(args);
-        sql = sql.replace(new RegExp("where_clause", 'g'), w);
+        var sql = arg.replace(new RegExp("where_clause", 'g'), where);
         sql = sql.replace(new RegExp("target_vol", 'g'), req.body.qty);
         sql = sql.replace(new RegExp("target_prc", 'g'), req.body.amount);
         sql = sql.replace(new RegExp("replace_version", 'g'), req.body.scenario.version);
         sql = sql.replace(new RegExp("replace_source", 'g'), req.body.source);
         sql = sql.replace(new RegExp("replace_iterdef", 'g'), JSON.stringify(req.body));
-        console.log(sql);
-        Postgres.FirstRow(sql, [], res)
+        Postgres.FirstRow(sql, res)
     }
 
     fs.readFile(path, 'utf8', function(err, data) {
         if (!err) {
             callback(data);
         } else {
-            console.log("fatal error pulling sql file")
-            callback(err);
+            console.log(`${new Date().toISOString()}: error reading sql file: ${JSON.stringify(err)}`);
+            res.send('Failed to read needed SQL file.');
         }
     });
 })
 
 server.post('/new_part', bodyParser.json(), function(req, res) {
 
-    var sql = "";
-    var w = "";
-    var c = 1;
-    var d = 1;
-    var args = [];
     var path = './route_sql/new_part.sql';
-    console.log(`${new Date().toISOString()}: POST /new_part  (Obsolete.)... SQL: ${path} ${"-._.".repeat(20)}`);
+    console.log(`${new Date().toISOString()}: POST /new_part  (Obsolete.)… SQL: ${path} ${"-._.".repeat(20)}`);
 
     var callback = function(arg) {
-        sql = arg;
-
-        ({ c, w, d } = build_where(req, c, w, d, args));
-
-        if (c == 1) {
+        var where = build_where(req);
+        if (where === '') {
             res.send("no body was sent");
             return;
         }
+
         req.body.stamp = new Date().toISOString()
-        console.log(req.body);
-        //console.log(args);
-        sql = sql.replace(new RegExp("where_clause", 'g'), w);
+        var sql = arg.replace(new RegExp("where_clause", 'g'), where);
         sql = sql.replace(new RegExp("target_vol", 'g'), req.body.qty);
         sql = sql.replace(new RegExp("target_prc", 'g'), req.body.amount);
         sql = sql.replace(new RegExp("replace_request", 'g'), JSON.stringify(req.body));
         sql = sql.replace(new RegExp("replace_version", 'g'), req.body.scenario.version);
         sql = sql.replace(new RegExp("replace_source", 'g'), req.body.source);
         sql = sql.replace(new RegExp("replace_iterdef", 'g'), JSON.stringify(req.body));
-        console.log(sql);
-        Postgres.FirstRow(sql, [], res)
+        Postgres.FirstRow(sql, res)
     }
 
     fs.readFile(path, 'utf8', function(err, data) {
         if (!err) {
             callback(data);
         } else {
-            console.log("fatal error pulling sql file")
-            callback(err);
+            console.log(`${new Date().toISOString()}: error reading sql file: ${JSON.stringify(err)}`);
+            res.send('Failed to read needed SQL file.');
         }
     });
 })
 
 server.post('/new_basket', bodyParser.json(), function(req, res) {
 
-    var sql = "";
-    var w = "";
-    var c = 1;
-    var d = 1;
-    var args = [];
     var path = './route_sql/new_basket.sql';
-    console.log(`${new Date().toISOString()}: POST /new_basket  (Add new part and/or customer.)... SQL: ${path} ${"-._.".repeat(20)}`);
+    console.log(`${new Date().toISOString()}: POST /new_basket  (Add new part and/or customer.)… SQL: ${path} ${"-._.".repeat(20)}`);
 
     var callback = function(arg) {
-        sql = arg;
         req.body.scenario.iter.push("adj volume"); //intercept the request body and force in a "adj volume" at position 1, only a "copy" iteration is being used
 
-        ({ c, w, d } = build_where(req, c, w, d, args));
-
-        if (c == 1) {
+        var where = build_where(req);
+        if (where === '') {
             res.send("no body was sent");
             return;
         }
+
         req.body.stamp = new Date().toISOString()
-        console.log(req.body);
-        sql = sql.replace(new RegExp("where_clause", 'g'), w);
+        var sql = arg.replace(new RegExp("where_clause", 'g'), where);
         sql = sql.replace(new RegExp("target_vol", 'g'), req.body.qty);
         sql = sql.replace(new RegExp("target_prc", 'g'), req.body.amount);
         sql = sql.replace(new RegExp("replace_request", 'g'), JSON.stringify(req.body));
         sql = sql.replace(new RegExp("replace_version", 'g'), req.body.scenario.version);
         sql = sql.replace(new RegExp("replace_source", 'g'), req.body.source);
         sql = sql.replace(new RegExp("replace_iterdef", 'g'), JSON.stringify(req.body));
-        console.log(sql);
-        Postgres.FirstRow(sql, [], res)
+        Postgres.FirstRow(sql, res)
     }
 
     fs.readFile(path, 'utf8', function(err, data) {
         if (!err) {
             callback(data);
         } else {
-            console.log("fatal error pulling sql file")
-            callback(err);
+            console.log(`${new Date().toISOString()}: error reading sql file: ${JSON.stringify(err)}`);
+            res.send('Failed to read needed SQL file.');
         }
     });
 })
 
-function build_where(req, c, w, d, args) {
+function build_where(req) {
+    console.log(`${new Date().toISOString()}: Building WHERE from ${JSON.stringify(req.body)}`);
+    var where = '';
+    var clauseCount = 1;
     for (var i in req.body.scenario) {
-        // console.log(i);
-        // console.log(req.body[i]);
-        if (c > 1) {
-            w = w +
+        if (clauseCount > 1) {
+            where = where +
                 `
             AND `;
         }
         if (Array.isArray(req.body.scenario[i])) {
             //if the scenario key has a value that is an array of items, push it into an `IN` statement
             //iter = [stage1, stage2]   -->  SQL  -->  iter IN ('stag1', stage2')
-            w = w + i + " IN (";
+            var listCount = 1;
+            where = where + i + " IN (";
             for (var j in req.body.scenario[i]) {
-                if (d > 1) {
-                    w = w + ",";
+                if (listCount > 1) {
+                    where = where + ",";
                 }
-                w = w + "'" + req.body.scenario[i][j] + "'";
-                d = d + 1;
+                where = where + "'" + req.body.scenario[i][j] + "'";
+                listCount = listCount + 1;
             }
-            w = w + ")";
+            where = where + ")";
         } else {
-            w = w + i + " = '" + req.body.scenario[i] + "'";
+            where = where + i + " = '" + req.body.scenario[i] + "'";
         }
-        args.push(req.body.scenario[i]);
-        c = c + 1;
+        clauseCount = clauseCount + 1;
     };
     //if the request has a stamp, then it's an adjustment
     //prevent making adjustment to actual history by limiting to current stamp and beyond
     if (req.body.stamp) {
-        w = w +
+        where = where +
             `
             AND order_date >= least('` + req.body.stamp + "'::date,'2021-06-01')";
     }
-    return { c, w, d };
+    console.log(`${new Date().toISOString()}: Returning ${where}`);
+    return where;
 }