diff --git a/var/www/friends.php b/var/www/friends.php
index 715415a..f333a3f 100644
--- a/var/www/friends.php
+++ b/var/www/friends.php
@@ -15,7 +15,7 @@
         <?php
             try{
                 echo '<pre>';
-//                echo "messageID\tdate\t\tsender\trecipient\tmessage\n\n";
+                echo "Friends:\n\n";
                 $sql_select = "SELECT friend";
                 $sql_from = "FROM friendList";
                 $sql_where = "WHERE username='".$_SESSION["loggedInUser"]."' AND confirm=true";
@@ -30,12 +30,6 @@
             }catch(Exception $e){
                 echo "Exception: ".$e->getMessage().PHP_EOL;
             }
-
-            echo '<h3>$GLOBALS</h3>';
-            echo '<pre>';
-            print_r($GLOBALS);
-            echo '</pre>';
-
         ?>
     </body>
 </html>
diff --git a/var/www/login.php b/var/www/login.php
index e230e0a..449bdc2 100644
--- a/var/www/login.php
+++ b/var/www/login.php
@@ -14,17 +14,16 @@
                 $_SESSION['loggedInUser'] = $_POST['login_username'];
                 unset($_SESSION['loginError']);
                 // Move onto landing page
-//                        header('Location: /landingPage.html');
+//                header('Location: /landingPage.html');
             }else{
-                // No matching users found, send user error
+                // No matching users found, send user an error message
                 $_SESSION['loginError'] = 'Invalid Username or Password';
-                // Return to login page
-//                        header("Location: /login.php");
             }
         }else{
-            // Return to login page, as credentials were not captured
-            $_SESSION["loginError"] = "Username and Password are required, please try again";
-//                    header("Location: /login.php");
+            // If user submitted login form wihout actually filling it out completely, send user an error message
+            if(!empty($_POST)){
+                $_SESSION["loginError"] = "Username and Password are required, please try again";
+            }
         }
     }catch(PDOException $e){
         echo "PDOException: ".$e->getMessage();
@@ -53,12 +52,6 @@
             <input type="password" name="login_password" placeholder="Password"><br />
             <input type="submit">
         </form>
-        <?php
-            echo '<h3>$GLOBALS</h3>';
-            echo '<pre>';
-            print_r($GLOBALS);
-            echo '</pre>';
-        ?>
     </body>
 </html>
 <?php
diff --git a/var/www/messages.php b/var/www/messages.php
index 89b964f..53c8877 100644
--- a/var/www/messages.php
+++ b/var/www/messages.php
@@ -34,12 +34,6 @@
             }catch(Exception $e){
                 echo "Exception: ".$e->getMessage().PHP_EOL;
             }
-/*
-            echo '<h3>$GLOBALS</h3>';
-            echo '<pre>';
-            print_r($GLOBALS);
-            echo '</pre>';
-*/
         ?>
     </body>
 </html>