diff --git a/appdb.py b/appdb.py
index 127a84b..7006f69 100755
--- a/appdb.py
+++ b/appdb.py
@@ -52,7 +52,7 @@ def updateMsgStatus(msg_id,status, msg_timestamp):
     #UPDATE messages SET delivered='success' WHERE pid='mdr2-46999f9ce19e11e99074722a1f1f4bb4'
     db = pymysql.connect(host=sqlhost, user=sqluser, passwd=sqlpass, db=sqldb)
     cur = db.cursor()
-    affected_count = cur.execute("UPDATE `messages` SET status=%s, `timestamp`=%s WHERE `pid`=%s",(status, msg_timestamp ,msg_id))
+    affected_count = cur.execute("UPDATE `messages` SET status=%s, `provider_timestamp`=%s WHERE `pid`=%s",(status, msg_timestamp ,msg_id))
     db.commit()
     db.close()
     return True
@@ -61,7 +61,7 @@ def updateMsgTimestamp(msg_id,timestamp):
     #This changes the timestamp of the msg_id to the timestamp provided by the provider.
     db = pymysql.connect(host=sqlhost, user=sqluser, passwd=sqlpass, db=sqldb)
     cur = db.cursor()
-    affected_count = cur.execute("UPDATE `messages` SET `timetsamp`=%s WHERE `pid`=%s",(timestamp,msg_id))
+    affected_count = cur.execute("UPDATE `messages` SET `provider_timestamp`=%s WHERE `pid`=%s",(timestamp,msg_id))
     db.commit()
     db.close()
 
@@ -69,7 +69,7 @@ def updateMsgTimestamp(msg_id,timestamp):
 def validateFrom(did):
     #this statement is here for testing. It bypasses DBs.
     if '17605551212' == did: 
-        return True
+        return Trueh
     db = pymysql.connect(host=sqlhost, user=sqluser, passwd=sqlpass, db=sqldb)
     cur = db.cursor()
     cur.execute("SELECT number FROM dids WHERE number=%s LIMIT 1" % did)
diff --git a/templates/single.html b/templates/single.html
index e399225..7a8cba4 100644
--- a/templates/single.html
+++ b/templates/single.html
@@ -17,8 +17,10 @@
         } else {
           $('#charNum').text(160 - len);
         }
-      }
+    }
     $("document").ready(function() {
+        fromDid = $("#source-num").val();
+        getNumMessages(fromDid);
             // Do something...
         function setStatus(statusmsg) {
             $("#alert-messages").text(statusmsg);
@@ -47,56 +49,56 @@
         });
         
         $( "#chat-form" ).submit(function( event ) {
-          $( "#submit-chat" ).prop("disabled", true);
-          event.preventDefault();
-          fromDid = $("#source-num").val();
-          targetDid = $("#dest-num").val();
-          inputchat = $("#input-chat").val();
-          
-          if (!$("#input-chat").val()){
-            setStatus("Empty message field! Cant do this!");
-            return false;
-          }
+            $( "#submit-chat" ).prop("disabled", true);
+            event.preventDefault();
+            fromDid = $("#source-num").val();
+            targetDid = $("#dest-num").val();
+            inputchat = $("#input-chat").val();
           
-          $.ajax({
-            method: "POST",
-            url: "/submitMessage",
-            data: { message: inputchat, fromdid: fromDid, targetdid : targetDid }
-          }).done(function( msg ) {
-            dt = new Date();
-            time = dt.getHours() + ":" + dt.getMinutes() + ":" + dt.getSeconds();
-            msgParsed = $.parseJSON(msg);
-            if (msgParsed.error) {
-                setStatus('Error! Got "'+ msgParsed.error +'"');
+            if (!$("#input-chat").val()){
+                setStatus("Empty message field! Cant do this!");
                 return false;
             }
-            fromDid = $("#source-num").val();
-            getNumMessages(fromDid);
-            setStatus('Success! Got "'+ msg +'"');
-            $( "#submit-chat" ).prop("disabled", false);
-            clearInput();
-            //$("#chat-form").prop('disabled',false);
-          });
+          
+            $.ajax({
+                method: "POST",
+                url: "/submitMessage",
+                data: { message: inputchat, fromdid: fromDid, targetdid : targetDid }
+            }).done(function( msg ) {
+                dt = new Date();
+                time = dt.getHours() + ":" + dt.getMinutes() + ":" + dt.getSeconds();
+                msgParsed = $.parseJSON(msg);
+                if (msgParsed.error) {
+                    setStatus('Error! Got "'+ msgParsed.error +'"');
+                    return false;
+                }
+                fromDid = $("#source-num").val();
+                getNumMessages(fromDid);
+                setStatus('Success! Got "'+ msg +'"');
+                $( "#submit-chat" ).prop("disabled", false);
+                $('#charNum').text('160');
+                clearInput();
+            });
         });
         $('#test-ajax').click(function() {
-          $.ajax({
-              url: '/testAjax',
-              type: 'GET',
-              success: function(response) {
+            $.ajax({
+                url: '/testAjax',
+                type: 'GET',
+                success: function(response) {
                 newHTML = '<div id="msg"><span class="chat-from">SYSTEM</span>: ' + response + '</div>';
                 statusHTML = '<div id="alert-messages">Success! Got "'+ response +'"</div>';
                 $("#chat-body").append( newHTML );
                 $("#alert-messages").html(statusHTML);
-              },
-              error: function(error) {
+            },
+            error: function(error) {
                 errorHTML = '<div id="msg"><span class="chat-from">SYSTEM</span>: Error ' + error + '</div>';
                 statusHTML = '<div id="alert-messages">Error! Got "'+ error +'"</div>';
                 $("#chat-body").append( errorHTML );
                 $("#alert-messages").html(statusHTML);
-              }
-          });
+            }
+            });
         });
-      });
+    });
     </script>
 </head>
 <body>