diff --git a/web/application/controllers/base.php b/web/application/controllers/base.php
index 0780856..b100240 100644
--- a/web/application/controllers/base.php
+++ b/web/application/controllers/base.php
@@ -59,10 +59,12 @@ abstract class base extends \system\engine\HF_Controller {
         foreach($expiredSessions as $session) {
             if ($session->to_user) {
                 /** @var \application\models\Sessions $otherSession */
-                $otherSession = \application\models\Sessions::getByField("id", $session->to_user);
-                $otherSession->waiting = true;
+                $otherSession = \application\models\Sessions::getByField("id", $session->to_user)[0];
+                $otherSession->waiting = 1;
                 $otherSession->to_user = null;
                 $otherSession->save();
+                \vendor\DB\DB::query("DELETE FROM messages WHERE user_from = ? AND user_to = ?", [$session->id, $otherSession->id]);
+                \vendor\DB\DB::query("DELETE FROM messages WHERE user_from = ? AND user_to = ?", [$otherSession->id, $session->id]);
             }
             $session->delete();
         }
diff --git a/web/application/controllers/main.php b/web/application/controllers/main.php
index 2448cbe..1f8fb8c 100644
--- a/web/application/controllers/main.php
+++ b/web/application/controllers/main.php
@@ -21,6 +21,10 @@ class main extends base
     }
 
     public function chat() {
+        if (!$this->session->data) {
+            header("location: /main/info/");
+            return;
+        }
         $this->session->waiting = 1;
         $this->session->save();
         $toUser = $this->session->to_user;
@@ -53,6 +57,13 @@ class main extends base
         }
     }
 
+    public function ignoresession() {
+        $ignore = $this->session->getData("ignore");
+        $ignore[] = $this->session->to_user;
+        $this->session->setData("ignore", $ignore);
+        $this->session->save();
+    }
+
     public function togglerandom() {
         if ($_POST["random"] == "true") {
             $this->session->random = 1;
@@ -75,12 +86,12 @@ class main extends base
         $search = false;
 
         // work around for SQLite
-        $lock = \application\models\Settings::getSetting("readLock");
+        //$lock = \application\models\Settings::getSetting("readLock");
 
-        while($lock) {
+        /*while($lock) {
             $lock = \application\models\Settings::getSetting("readLock");
         }
-        \application\models\Settings::setSetting("readLock", (int)true);
+        \application\models\Settings::setSetting("readLock", (int)true);*/
 
         // Check if the current user is talking to someone
         $toUser = $this->session->to_user;
@@ -99,13 +110,23 @@ class main extends base
         // search for someone else in waiting queue
         /** @var \application\models\Sessions $firstResult */
         $firstResult = null;
+        $tmpSessions = [];
+        $ignoreUsers = $this->session->getData("ignore") ?: [];
         if ($search) {
             $allSessions = \application\models\Sessions::getByField("waiting", 1);
+            foreach ($allSessions as $session) {
+                $ignoreUsersOther = $session->getData("ignore") ?: [];
+                if (!in_array($session->id, $ignoreUsers) && !in_array($this->session->id, $ignoreUsersOther)) {
+                    $tmpSessions[] = $session;
+                }
+                $allSessions = $tmpSessions;
+            }
+
             shuffle($allSessions);
             shuffle($allSessions);
             /** @var \application\models\Sessions $session */
             foreach ($allSessions as $session) {
-                if ($session->getData("toUser") == $this->session->id && $toUser == null) {
+                if ($session->to_user == $this->session->id && $toUser == null) {
                     // "kick the other user"
                     $session->to_user = null;
                     $session->waiting = 0;
@@ -113,7 +134,9 @@ class main extends base
                     continue;
                 }
                 if ($session->waiting && $session->id != $this->session->id) {
-                    $firstResult = $session;
+                    if ($session->random) {
+                        $firstResult = $session;
+                    }
                     $interestWeight = [];
                     $gender1Weight = true;
                     $gender2Weight = true;
@@ -147,7 +170,7 @@ class main extends base
             }
 
             if (!$result) {
-                \application\models\Settings::setSetting("readLock", (int)false);
+                //\application\models\Settings::setSetting("readLock", (int)false);
                 echo json_encode(false);
                 return;
             }
@@ -164,6 +187,6 @@ class main extends base
         }
 
         echo json_encode($return);
-        \application\models\Settings::setSetting("readLock", (int)false);
+        //\application\models\Settings::setSetting("readLock", (int)false);
     }
 }
\ No newline at end of file
diff --git a/web/application/views/chat.html b/web/application/views/chat.html
index b3d44a4..6af0670 100644
--- a/web/application/views/chat.html
+++ b/web/application/views/chat.html
@@ -3,23 +3,39 @@
 {% block content %}
 <div class="centered">
     <div class="checkbox">
-        <label> <input type="checkbox" id="random"
-                       title="Checking this box will match you with anyone - including those that don't match what you are looking for"
+        <label> <input type="checkbox" id="random" class="set-tooltip"
+                       title="Checking this box will match you with anyone - including those that don't match what you are looking for.
+                       You and the other party must have this box checked for it to create a match."
                        {% if session.random %}checked="checked"{% endif %}
                         >
             Match random users</label>
     </div>
     <div id="container">
+        <button title="You may or may not be matched with the same person again" type="button" id="newMatch" class="set-tooltip btn btn-primary">Find new match</button>
+        <button title="This will prevent the person at the current session from talking to you and match you with a new person" id="banAndNewMatch" type="button" class="set-tooltip btn btn-danger">Ignore and find new match</button>
+        <br>
+        <br>
         <textarea disabled="disabled" autocomplete="off" cols="100" rows="25" id="chat"></textarea>
         <br>
-        <input autocomplete="off" style="width: 725px;" placeholder="Your message here..." type="text" id="input">
+        <input autocomplete="off" style="width: 725px;" placeholder="Your message here..." type="text" id="input"><br>
+
     </div>
 </div>
 
 <script type="text/javascript">
     $(function () {
 
-        $("#random").tooltip();
+        $("#newMatch").click(function () {
+            location.reload();
+        });
+
+        $("#banAndNewMatch").click(function () {
+            $.get("./main/ignoresession/", function () {
+                location.reload();
+            });
+        });
+
+        $(".set-tooltip").tooltip();
 
         $("#random").change(function (e) {
             console.log(e);