diff --git a/src/QueryApp.java b/src/QueryApp.java
index 81d5677ad2deaa571bde8dae1fc3e59f6ef6298e..71be79fdf14b670a0c431687e54a82fd835e0252 100644
--- a/src/QueryApp.java
+++ b/src/QueryApp.java
@@ -98,7 +98,7 @@ public class QueryApp {
                         colName = "COUNT(DISTINCT ID)";
                         break;
                     case "numBounces":
-                        rs = prepareDateStatement(c, "SELECT COUNT(PagesViewed) FROM ServerLog WHERE PagesViewed = 1 AND date(EntryDate) BETWEEN ? AND ?)", d1, d2).executeQuery();
+                        rs = prepareDateStatement(c, "SELECT COUNT(PagesViewed) FROM ServerLog WHERE PagesViewed = 1 AND date(EntryDate) BETWEEN ? AND ?", d1, d2).executeQuery();
                         colName = "COUNT(PagesViewed)";
                         break;
                     case "numConversions":
@@ -241,8 +241,8 @@ public class QueryApp {
         String clickCostQuery = "SELECT SUM(ClickCost), Date as 'DATE()' FROM Click GROUP BY (strftime('%W', date(Date)));";
         String bouncesQuery = "SELECT COUNT(PagesViewed) FROM ServerLog WHERE PagesViewed = 1 GROUP BY (strftime('%W', date(EntryDate)));";
         String conversionsQuery = "SELECT COUNT(Conversion) FROM ServerLog WHERE Conversion = \"Yes\" GROUP BY (strftime('%W', date(EntryDate)));";
-        return calcMetricsOverTime(c, datetimeQuery, impressionsQuery, impressionCostQuery, clicksQuery, uniquesQuery, clickCostQuery, bouncesQuery, conversionsQuery);
-        ArrayList<Data> toReturn = calcMetricsOverTime(dbName, datetimeQuery, impressionsQuery, impressionCostQuery, clicksQuery, uniquesQuery, clickCostQuery, bouncesQuery, conversionsQuery);
+        //return calcMetricsOverTime(c, datetimeQuery, impressionsQuery, impressionCostQuery, clicksQuery, uniquesQuery, clickCostQuery, bouncesQuery, conversionsQuery);
+        ArrayList<Data> toReturn = calcMetricsOverTime(c, datetimeQuery, impressionsQuery, impressionCostQuery, clicksQuery, uniquesQuery, clickCostQuery, bouncesQuery, conversionsQuery);
         for (int i =0; i<(toReturn.size()); i++){
             String date = toReturn.get(i).getDateString();
             toReturn.get(i).setDateString("Week "+ Integer.toString(i+1) + " (" + date.substring(0, date.length()-9) + ")");
@@ -260,10 +260,10 @@ public class QueryApp {
         String clickCostQuery = "SELECT SUM(ClickCost), Date as 'DATE()' FROM Click GROUP BY substr(time(Date),1,2);";
         String bouncesQuery = "SELECT COUNT(PagesViewed) FROM ServerLog WHERE PagesViewed = 1 GROUP BY substr(time(EntryDate),1,2);";
         String conversionsQuery = "SELECT COUNT(Conversion) FROM ServerLog WHERE Conversion = \"Yes\" GROUP BY substr(time(EntryDate),1,2);";
-        return calcMetricsOverTime(c, datetimeQuery, impressionsQuery, impressionCostQuery, clicksQuery, uniquesQuery, clickCostQuery, bouncesQuery, conversionsQuery);
+        //return calcMetricsOverTime(c, datetimeQuery, impressionsQuery, impressionCostQuery, clicksQuery, uniquesQuery, clickCostQuery, bouncesQuery, conversionsQuery);
         //Updates the datetime string of each data entry to better suit the table
 
-        ArrayList<Data> toReturn = calcMetricsOverTime(dbName, datetimeQuery, impressionsQuery, impressionCostQuery, clicksQuery, uniquesQuery, clickCostQuery, bouncesQuery, conversionsQuery);
+        ArrayList<Data> toReturn = calcMetricsOverTime(c, datetimeQuery, impressionsQuery, impressionCostQuery, clicksQuery, uniquesQuery, clickCostQuery, bouncesQuery, conversionsQuery);
         for (int i=0; i<10; i++){
             toReturn.get(i).setDateString("0"+Integer.toString(i)+":00");
         }