diff --git a/add_asset_csv_modal.php b/add_asset_csv_modal.php
index 6099668f..5fb85053 100644
--- a/add_asset_csv_modal.php
+++ b/add_asset_csv_modal.php
@@ -8,12 +8,12 @@
                 </button>
             </div>
             <div class="modal-body bg-white">
-                <p>Format: name, type, make, model, serial, os</p>
+                <p>Format: CSV file with headings & data: name, type, make, model, serial, os</p>
                 <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
                     <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
 
                     <div class="form-group">
-                        <input type="file" class="form-control-file" name="file">
+                        <input type="file" class="form-control-file" name="file" accept=".csv">
                     </div>
 
             </div>
diff --git a/add_file_modal.php b/add_file_modal.php
index 1b32c042..c61fde19 100644
--- a/add_file_modal.php
+++ b/add_file_modal.php
@@ -16,7 +16,7 @@
           </div>
 
           <div class="form-group">
-            <input type="file" class="form-control-file" name="file">
+            <input type="file" class="form-control-file" name="file" accept=".jpg, .gif, .png, .pdf, .txt, .doc, .docx, .csv, .xls, .xlsx, .zip, .tar, .gz">
           </div>
           
         </div>
diff --git a/post.php b/post.php
index 0cca7d8f..31919d47 100644
--- a/post.php
+++ b/post.php
@@ -4135,14 +4135,35 @@ if(isset($_POST['add_asset'])){
 if(isset($_POST["import_client_assets_csv"])){
     $client_id = intval($_POST['client_id']);
 	$file_name = $_FILES["file"]["tmp_name"];
+	$error = FALSE;
 
-	if($_FILES["file"]["size"] > 0){
+    //Check file is CSV
+    $file_extension = strtolower(end(explode('.',$_FILES['file']['name'])));
+    $allowed_file_extensions = array('csv');
+    if(in_array($file_extension,$allowed_file_extensions) === false){
+        $error = TRUE;
+        $_SESSION['alert_message'] = "Bad file extension";
+    }
 
-        //Need to put a CSV file check and maybe a format check so it doesnt just import anything
+    //Check file isn't empty
+    elseif($_FILES["file"]["size"] < 1){
+        $error = TRUE;
+        $_SESSION['alert_message'] = "Bad file size (empty?)";
+    }
 
+    //(Else)Check column count (name, type, make, model, serial, os)
+    $f = fopen($file_name, "r");
+    $f_columns = fgetcsv($f, 1000, ",");
+    if(!$error & count($f_columns) != 6) {
+        $error = TRUE;
+        $_SESSION['alert_message'] = "Bad column count.";
+    }
+
+    //Else, parse the file
+    if(!$error){
         $file = fopen($file_name, "r");
         fgetcsv($file, 1000, ","); // Skip first line
-        $count = 0;
+        $asset_count = 0;
         while(($column = fgetcsv($file, 1000, ",")) !== FALSE){
             if(isset($column[0])){
                 $name = trim(strip_tags(mysqli_real_escape_string($mysqli, $column[0])));
@@ -4167,20 +4188,21 @@ if(isset($_POST["import_client_assets_csv"])){
             //Add
             mysqli_query($mysqli,"INSERT INTO assets SET asset_name = '$name', asset_type = '$type', asset_make = '$make', asset_model = '$model', asset_serial = '$serial', asset_os = '$os', asset_created_at = NOW(), asset_client_id = $client_id, company_id = $session_company_id");
 
-            $count = $count + 1;
+            $asset_count = $asset_count + 1;
         }
         fclose($file);
 
         //Logging
-        mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Asset', log_action = 'Import', log_description = '$session_name imported $count asset(s) via CSV file', log_created_at = NOW(), company_id = $session_company_id, log_client_id = $client_id, log_user_id = $session_user_id");
+        mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Asset', log_action = 'Import', log_description = '$session_name imported $asset_count asset(s) via CSV file', log_created_at = NOW(), company_id = $session_company_id, log_client_id = $client_id, log_user_id = $session_user_id");
 
-        $_SESSION['alert_message'] = "$count Asset(s) added";
-    }else{
-	    // The file was empty
-	    $_SESSION['alert_type'] = "warning";
-        $_SESSION['alert_message'] = "Something went wrong";
+        $_SESSION['alert_message'] = "$asset_count Asset(s) added";
+        header("Location: " . $_SERVER["HTTP_REFERER"]);
+    }
+    //Check for any errors, if there are notify user and redirect
+    if($error) {
+        $_SESSION['alert_type'] = "warning";
+        header("Location: " . $_SERVER["HTTP_REFERER"]);
     }
-    header("Location: " . $_SERVER["HTTP_REFERER"]);
 }
 
 if(isset($_POST['edit_asset'])){
@@ -5201,6 +5223,9 @@ if(isset($_GET['delete_document'])){
 
     mysqli_query($mysqli,"DELETE FROM documents WHERE document_id = $document_id AND company_id = $session_company_id");
 
+    // Delete the tag associations to documents
+    mysqli_query($mysqli, "DELETE FROM documents_tagged WHERE document_id = '$document_id'");
+
     //Logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Document', log_action = 'Deleted', log_description = '$document_id', log_created_at = NOW(), company_id = $session_company_id, log_user_id = $session_user_id");