diff --git a/judge.class.php b/judge.class.php
index 356d7870..68211035 100644
--- a/judge.class.php
+++ b/judge.class.php
@@ -276,6 +276,20 @@ function tableEditorSave($data)
 
 }
 
+function tableEditorDelete()
+{
+	global $config;
+
+	$id = $this->id;
+
+	mysql_query("DELETE FROM judges_teams_link WHERE judges_id='$id' AND year=".$config['FAIRYEAR']."'");
+	mysql_query("DELETE FROM judges_years WHERE judges_id='$id' AND year='".$config['FAIRYEAR']."'");
+
+	echo happy(i18n("Successfully removed judge from this year's fair"));
+}
+
+
+
 };
 
 ?>
diff --git a/tableeditor.class.php b/tableeditor.class.php
index 8cb3753b..bc81da3d 100644
--- a/tableeditor.class.php
+++ b/tableeditor.class.php
@@ -414,7 +414,7 @@ class TableEditor
 		return $editdata;
 	}
 
-	function defaultSave($insert_mode, $editdata)
+	function defaultSave($insert_mode, $keyval, $editdata)
 	{
 		$query = "";
 		if($insert_mmode) {
@@ -442,13 +442,19 @@ class TableEditor
 		if($insertmode) {
 			$query.=")";
 		} else {
-			$query.=" WHERE {$this->primaryKey}='{$_POST['editsave']}'";
+			$query.=" WHERE {$this->primaryKey}='{$keyval}'";
 		}
 
 		if($this->DEBUG) echo $query;
 		mysql_query($query);
 	}
 
+	function defaultDelete($keyval)
+	{
+		mysql_query("DELETE FROM {$this->table} WHERE {$this->primaryKey}='{$keyval}'");
+		echo happy(i18n("Successfully deleted %1",array($this->recordType)));
+	}
+
 	function execute()
 	{
 		if($_GET['TableEditorAction']=="sort" && $_GET['sort'])
@@ -458,8 +464,12 @@ class TableEditor
 		
 		if($_GET['TableEditorAction']=="delete" && $_GET['delete'])
 		{
-			mysql_query("DELETE FROM {$this->table} WHERE {$this->primaryKey}='{$_GET['delete']}'");
-			echo happy(i18n("Successfully deleted %1",array($this->recordType)));
+			$data = new $this->classname($_GET['delete']);
+			if(method_exists($data, 'tableEditorDelete')) {
+				$data->tableEditorDelete();
+			} else {
+				$this->defaultDelete($_GET['delete']);
+			}
 		}
 
 		if($_GET['TableEditorAction']=="page" && $_GET['page'])
@@ -470,8 +480,6 @@ class TableEditor
 		if( ($_POST['TableEditorAction']=="editsave" && $_POST['editsave']) 
 		 || ($_POST['TableEditorAction']=="addsave")  )
 		{
-
-
 			if($_POST['TableEditorAction']=="addsave") {
 				$data = new $this->classname();
 				$insert_mode = 1;
@@ -595,7 +603,8 @@ class TableEditor
 			if(method_exists($data, 'tableEditorSave')) {
 				$data->tableEditorSave($editdata);
 			} else {
-				$this->defaultSave($insert_mode, $editdata);
+				$keyval = ($insert_mode == 0) ? $_POST['editsave'] : 0;
+				$this->defaultSave($insert_mode, $keyval, $editdata);
 			}
 			
 
@@ -756,10 +765,11 @@ class TableEditor
 					case "multicheck":
 						$ks = array_keys($this->fieldOptions[$f]);
 						foreach($ks as $k) {
-							if(array_key_exists($k, $editdata[$f])) {
-								$ch = ' checked=checked ';
-							} else {
-								$ch = '';
+							$ch = '';
+							if(is_array($editdata[$f])) {
+								if(array_key_exists($k, $editdata[$f])) {
+									$ch = ' checked=checked ';
+								} 
 							}
 							echo "<input type=\"checkbox\" name=\"{$f}[$k]\" value=\"1\" $ch> {$this->fieldOptions[$f][$k]}<br>";
 						}