diff --git a/Bookings/src/db.js b/Bookings/src/db.js
index 6fc76fc..315fd81 100644
--- a/Bookings/src/db.js
+++ b/Bookings/src/db.js
@@ -1,15 +1,22 @@
 var mariadb = require('mariadb');
 require('dotenv').config();
 
+
 const pool = mariadb.createPool({
     host: process.env.DB_HOST, 
     user: process.env.DB_USER, 
     password: process.env.DB_PASS,
     port: process.env.DB_PORT,
     multipleStatements: true,
-    connectionLimit: 5
+    connectionLimit: 5,
+    timezone: 'UTC',
+    dateStrings: [
+      'DATE',
+      'DATETIME'
+    ]
 });
 
+
 module.exports={
     getConnection: function(){
       return new Promise(function(resolve,reject){
diff --git a/Bookings/src/routes/flightsRoutes.js b/Bookings/src/routes/flightsRoutes.js
index 8295419..704ae4e 100644
--- a/Bookings/src/routes/flightsRoutes.js
+++ b/Bookings/src/routes/flightsRoutes.js
@@ -61,9 +61,16 @@ router.get("/", async (req, res, next) => {
                         t.dest = ?";
 
         var results = await conn.query(query, [month,day,origin,dest,year,month,day,month,day,origin,dest,date,origin,dest]);
-        var analyzedResults = analyzeResults(results);
-        res.send(analyzedResults);
+
+        if (results.length > 0) {
+            var analyzedResults = analyzeResults(results);
+            res.send(analyzedResults);
+        }
+        else {
+            res.send(results);
+        }
     } catch (err) {
+        console.log(err);
         throw err;
     } finally {
         if (conn) return conn.release();
diff --git a/Bookings/src/routes/tripsRoutes.js b/Bookings/src/routes/tripsRoutes.js
index 2c3e846..70c34c3 100644
--- a/Bookings/src/routes/tripsRoutes.js
+++ b/Bookings/src/routes/tripsRoutes.js
@@ -73,7 +73,20 @@ router.get("/", async (req, res, next) => {
 // secret (scoring) sauce
 function analyzeResults(items) {
     items.forEach(item => { 
-        let forecast = forecasts[item.origin + "_" + item.fl_date.toISOString().substring(0, 10)];
+        let forecast = forecasts[item.origin + "_" + item.fl_date];
+
+        // Catch all in case the forecast hasn't been updated
+        if (forecast === undefined) {
+            forecast = {
+                description: "Clear",
+                icon: "clear-day",
+                temp_low: "55°F",
+                temp_high: "55°F",
+                precip_probability: 0.2,
+                wind_speed: 10
+            };
+        }
+
         let weather_score = 5 - 5*(forecast.precip_probability + (forecast.wind_speed/100));
         let historical_score = round(5 * ((100 - item.delayed_pct)/100), 1);
         let overall_score = round((weather_score + historical_score) / 2, 1);
@@ -103,7 +116,7 @@ function round(value, precision) {
 // You can either tie into an existing Weather Forecast API 
 // or provide hard-coded lookups like the following.
 var forecasts = {
-    "ORD_2020-02-06": {
+    "ORD_2020-02-09": {
         description: "Snow",
         icon: "snow",
         temp_low: "28°F",
@@ -111,7 +124,7 @@ var forecasts = {
         precip_probability: 0.6,
         wind_speed: 15
     },
-    "LAX_2020-02-08": {
+    "LAX_2020-02-11": {
         description: "Clear",
         icon: "clear-day",
         temp_low: "56°F",