diff --git a/php/about.php b/php/about.php
index 21d192c..c27ad21 100644
--- a/php/about.php
+++ b/php/about.php
@@ -90,7 +90,7 @@
       </div>
 
       <div class="footer">
-        <p>&copy; Trivialand 2013</p>
+        <p>&copy; Trivialand 2013 - <a href="https://github.com/tannn/TriviaTime">github</a></p>
       </div>
 
     </div> <!-- /container -->
diff --git a/php/contact.php b/php/contact.php
index 0a5dc26..052bab5 100644
--- a/php/contact.php
+++ b/php/contact.php
@@ -89,7 +89,7 @@
       </div>
 
       <div class="footer">
-        <p>&copy; Trivialand 2013</p>
+        <p>&copy; Trivialand 2013 - <a href="https://github.com/tannn/TriviaTime">github</a></p>
       </div>
 
     </div> <!-- /container -->
diff --git a/php/index.php b/php/index.php
index b6d7f8c..85ba02c 100644
--- a/php/index.php
+++ b/php/index.php
@@ -126,7 +126,7 @@
       </div>
 
       <div class="footer">
-        <p>&copy; Trivialand 2013</p>
+        <p>&copy; Trivialand 2013 - <a href="https://github.com/tannn/TriviaTime">github</a></p>
       </div>
 
     </div> <!-- /container -->
diff --git a/php/reports.php b/php/reports.php
index 30866e8..5d2c1cc 100644
--- a/php/reports.php
+++ b/php/reports.php
@@ -89,7 +89,7 @@
       </div>
 
       <div class="row">
-        <div class="span6">
+        <div class="span12">
           <h2>Reports</h2>
             <table class="table">
               <thead>
@@ -100,30 +100,31 @@
                 </tr>
               </thead>
               <tbody>
-<?php
-    if ($db) {
-        $q = $db->query('SELECT * FROM triviareport LIMIT 10');
-        if ($q === false) {
-            die("Error: database error: table does not exist\n");
-        } else {
-            $result = $q->fetchAll();
-            foreach($result as $res) {
-                echo '<tr>';
-                echo '<td>' . $res['id'] . '</td>';
-                echo '<td>' . $res['username'] . '</td>';
-                echo '<td>' . $res['report_text'] . '</td>';
-                echo '</tr>';
-            }
-        }
-    } else {
-        die('Couldnt connect to db');
-    }
-?>
+                <?php
+                    if ($db) {
+                        $q = $db->query('SELECT * FROM triviareport LIMIT 10');
+                        if ($q === false) {
+                            die("Error: database error: table does not exist\n");
+                        } else {
+                            $result = $q->fetchAll();
+                            foreach($result as $res) {
+                                echo '<tr>';
+                                echo '<td>' . $res['id'] . '</td>';
+                                echo '<td>' . $res['username'] . '</td>';
+                                echo '<td>' . $res['report_text'] . '</td>';
+                                echo '</tr>';
+                            }
+                        }
+                    } else {
+                        die('Couldnt connect to db');
+                    }
+                ?>
               </tbody>
             </table>
         </div>
-
-        <div class="span6">
+      </div>
+      <div class="row">
+        <div class="span12">
           <h2>Edits</h2>
             <table class="table">
               <thead>
@@ -131,30 +132,32 @@
                   <th>Edit #</th>
                   <th>Username</th>
                   <th>New Question</th>
+                  <th>Old Question</th>
                   <th>Question #</th>
                 </tr>
               </thead>
               <tbody>
-<?php
-    if ($db) {
-        $q = $db->query('SELECT * FROM triviaedit ORDER BY id DESC LIMIT 10');
-        if ($q === false) {
-            die("Error: database error: table does not exist\n");
-        } else {
-            $result = $q->fetchAll();
-            foreach($result as $res) {
-                echo '<tr>';
-                echo '<td>' . $res['id'] . '</td>';
-                echo '<td>' . $res['username'] . '</td>';
-                echo '<td>' . $res['question'] . '</td>';
-                echo '<td>' . $res['question_id'] . '</td>';
-                echo '</tr>';
-            }
-        }
-    } else {
-        die($err);
-    }
-?>
+                <?php
+                    if ($db) {
+                        $q = $db->query('SELECT *, tq.question as original  FROM triviaedit INNER JOIN triviaquestion tq on tq.id=question_id ORDER BY id DESC LIMIT 10');
+                        if ($q === false) {
+                            die("Error: database error: table does not exist\n");
+                        } else {
+                            $result = $q->fetchAll();
+                            foreach($result as $res) {
+                                echo '<tr>';
+                                echo '<td>' . $res['id'] . '</td>';
+                                echo '<td>' . $res['username'] . '</td>';
+                                echo '<td>' . $res['question'] . '</td>';
+                                echo '<td>' . $res['original'] . '</td>';
+                                echo '<td>' . $res['question_id'] . '</td>';
+                                echo '</tr>';
+                            }
+                        }
+                    } else {
+                        die($err);
+                    }
+                ?>
               </tbody>
             </table>
         </div>
@@ -162,7 +165,7 @@
       </div>
 
       <div class="footer">
-        <p>&copy; Trivialand 2013</p>
+        <p>&copy; Trivialand 2013 - <a href="https://github.com/tannn/TriviaTime">github</a></p>
       </div>
 
     </div> <!-- /container -->
diff --git a/php/stats.php b/php/stats.php
index 6dec59b..cc92342 100644
--- a/php/stats.php
+++ b/php/stats.php
@@ -91,7 +91,7 @@
 
       <div class="row">
         <div class="span6">
-          <h2>Top10 of ALL TIME</h2>
+          <h2>All Time Top Scores</h2>
             <table class="table">
               <thead>
                 <tr>
@@ -101,32 +101,32 @@
                 </tr>
               </thead>
               <tbody>
-<?php
-    if ($db) {
-        $q = $db->query('SELECT username, sum(points_made) as points FROM triviauserlog GROUP BY username ORDER BY points DESC LIMIT 10');
-        if ($q === false) {
-            die("Error: database error: table does not exist\n");
-        } else {
-            $result = $q->fetchAll();
+                <?php
+                    if ($db) {
+                        $q = $db->query('SELECT username, sum(points_made) as points FROM triviauserlog GROUP BY username ORDER BY points DESC LIMIT 10');
+                        if ($q === false) {
+                            die("Error: database error: table does not exist\n");
+                        } else {
+                            $result = $q->fetchAll();
 
-            foreach($result as $key=>$res) {
+                            foreach($result as $key=>$res) {
 
-                echo '<tr>';
-                echo '<td>' . ($key+1) . '</td>';
-                echo '<td>' . $res['username'] . '</td>';
-                echo '<td>' . $res['points'] . '</td>';
-                echo '</tr>';
-            }
-        }
-    } else {
-        die($err);
-    }
-?>
+                                echo '<tr>';
+                                echo '<td>' . ($key+1) . '</td>';
+                                echo '<td>' . $res['username'] . '</td>';
+                                echo '<td>' . $res['points'] . '</td>';
+                                echo '</tr>';
+                            }
+                        }
+                    } else {
+                        die($err);
+                    }
+                ?>
               </tbody>
             </table>
         </div>
         <div class="span6">
-          <h2>Todays TOP10</h2>
+          <h2>Todays Top Scores</h2>
             <table class="table">
               <thead>
                 <tr>
@@ -136,37 +136,168 @@
                 </tr>
               </thead>
               <tbody>
-<?php
-    $day = date('j');
-    $month = date('m');
-    $year = date('Y');
+                <?php
+                    $day = date('j');
+                    $month = date('m');
+                    $year = date('Y');
 
-    if ($db) {
-        $q = $db->prepare("SELECT username, sum(points_made) as points FROM triviauserlog WHERE day=:day AND year=:year AND month=:month GROUP BY username ORDER BY points DESC LIMIT 10");
-        $q->execute(array(':day'=>$day, 'year'=>$year, 'month'=>$month));
-        if ($q === false) {
-            die("Error: database error: table does not exist\n");
-        } else {
-            $result = $q->fetchAll();
-            foreach($result as $key=>$res) {
-                echo '<tr>';
-                echo '<td>' . ($key+1) . '</td>';
-                echo '<td>' . $res['username'] . '</td>';
-                echo '<td>' . $res['points'] . '</td>';
-                echo '</tr>';
-            }
-        }
-    } else {
-        die($err);
-    }
-?>
+                    if ($db) {
+                        $q = $db->prepare("SELECT username, sum(points_made) as points FROM triviauserlog WHERE day=:day AND year=:year AND month=:month GROUP BY username ORDER BY points DESC LIMIT 10");
+                        $q->execute(array(':day'=>$day, 'year'=>$year, 'month'=>$month));
+                        if ($q === false) {
+                            die("Error: database error: table does not exist\n");
+                        } else {
+                            $result = $q->fetchAll();
+                            foreach($result as $key=>$res) {
+                                echo '<tr>';
+                                echo '<td>' . ($key+1) . '</td>';
+                                echo '<td>' . $res['username'] . '</td>';
+                                echo '<td>' . $res['points'] . '</td>';
+                                echo '</tr>';
+                            }
+                        }
+                    } else {
+                        die($err);
+                    }
+                ?>
               </tbody>
             </table>
         </div>
       </div>
 
+      <div class="row">
+        <div class="span4">
+          <h2>Month Top Scores</h2>
+            <table class="table">
+              <thead>
+                <tr>
+                  <th>#</th>
+                  <th>Username</th>
+                  <th>Points</th>
+                </tr>
+              </thead>
+              <tbody>
+                <?php
+                    $day = date('j');
+                    $month = date('m');
+                    $year = date('Y');
+
+                    if ($db) {
+                        $q = $db->prepare("SELECT username, sum(points_made) as points FROM triviauserlog WHERE year=:year AND month=:month GROUP BY username ORDER BY points DESC LIMIT 10");
+                        $q->execute(array('year'=>$year, 'month'=>$month));
+                        if ($q === false) {
+                            die("Error: database error: table does not exist\n");
+                        } else {
+                            $result = $q->fetchAll();
+                            foreach($result as $key=>$res) {
+                                echo '<tr>';
+                                echo '<td>' . ($key+1) . '</td>';
+                                echo '<td>' . $res['username'] . '</td>';
+                                echo '<td>' . $res['points'] . '</td>';
+                                echo '</tr>';
+                            }
+                        }
+                    } else {
+                        die($err);
+                    }
+                ?>
+              </tbody>
+            </table>
+        </div>
+        <div class="span4">
+          <h2>Year Top Scores</h2>
+            <table class="table">
+              <thead>
+                <tr>
+                  <th>#</th>
+                  <th>Username</th>
+                  <th>Points</th>
+                </tr>
+              </thead>
+              <tbody>
+                <?php
+                    $day = date('j');
+                    $month = date('m');
+                    $year = date('Y');
+
+                    if ($db) {
+                        $q = $db->prepare("SELECT username, sum(points_made) as points FROM triviauserlog WHERE year=:year GROUP BY username ORDER BY points DESC LIMIT 10");
+                        $q->execute(array('year'=>$year));
+                        if ($q === false) {
+                            die("Error: database error: table does not exist\n");
+                        } else {
+                            $result = $q->fetchAll();
+                            foreach($result as $key=>$res) {
+                                echo '<tr>';
+                                echo '<td>' . ($key+1) . '</td>';
+                                echo '<td>' . $res['username'] . '</td>';
+                                echo '<td>' . $res['points'] . '</td>';
+                                echo '</tr>';
+                            }
+                        }
+                    } else {
+                        die($err);
+                    }
+                ?>
+
+              </tbody>
+            </table>
+        </div>
+
+        <?php
+          $sqlClause = '';
+          $week = new DateTime();
+          $interval = new DateInterval('P'.$day.'D');
+          $week->sub($interval);
+          $interval = new DateInterval('P1D');
+          for($i=0;$i<7;$i++) {
+            if($i>0) {
+              $sqlClause .= ' or ';
+            }
+            $sqlClause .= '(day=' . $week->format('j') . 
+                            ' and month=' . $week->format('n') .
+                            ' and year=' . $week->format('Y') . 
+                            ')';
+            $week->add($interval);
+          }
+        ?>
+        <div class="span4">
+          <h2>Week Top Scores</h2>
+            <table class="table">
+              <thead>
+                <tr>
+                  <th>#</th>
+                  <th>Username</th>
+                  <th>Points</th>
+                </tr>
+              </thead>
+              <tbody>
+<?php
+    if ($db) {
+        $q = $db->query("SELECT username, sum(points_made) as points FROM triviauserlog WHERE $sqlClause GROUP BY username ORDER BY points DESC LIMIT 10");
+        if ($q === false) {
+            die("Error: database error: table does not exist\n");
+        } else {
+            $result = $q->fetchAll();
+            foreach($result as $key=>$res) {
+                echo '<tr>';
+                echo '<td>' . ($key+1) . '</td>';
+                echo '<td>' . $res['username'] . '</td>';
+                echo '<td>' . $res['points'] . '</td>';
+                echo '</tr>';
+            }
+        }
+    } else {
+        die($err);
+    }
+?>
+
+              </tbody>
+            </table>
+        </div>
+      </div>
       <div class="footer">
-        <p>&copy; Trivialand 2013</p>
+        <p>&copy; Trivialand 2013 - <a href="https://github.com/tannn/TriviaTime">github</a></p>
       </div>
 
     </div> <!-- /container -->
diff --git a/storage/samplequestions b/storage/samplequestions
new file mode 100644
index 0000000..9add35a
--- /dev/null
+++ b/storage/samplequestions
@@ -0,0 +1,4 @@
+foo*bar
+Hello*world
+Answer to everything*42
+Lorem*Ipsum
diff --git a/storage/samplequestions~ b/storage/samplequestions~
new file mode 100644
index 0000000..e69de29