diff --git a/Backend/Controllers/FileHandler/GetGameData.php b/Backend/Controllers/FileHandler/GetGameData.php
index e9c2f3d..d440440 100644
--- a/Backend/Controllers/FileHandler/GetGameData.php
+++ b/Backend/Controllers/FileHandler/GetGameData.php
@@ -13,7 +13,7 @@ if (isset($_GET['gameDataId'])) {
     $registrationIds = Registration::where("group_id", $_GET['groupId'])->pluck("game_data_id")->toArray();
     $openGameDataStream = GameData::whereIn("id", $registrationIds)->get();
 } elseif (isset($_GET['gameJamId'])) {
-    $gameDataIds = Group::where("game_jam_id", $_GET['gameJamId'])->pluck("game_data_id")->toArray();
+    $gameDataIds = Registration::where("game_jam_id", $_GET['gameJamId'])->pluck("game_data_id")->toArray();
     $openGameDataStream = GameData::whereIn("id", $gameDataIds)->get();
 } else {
     $openGameDataStream = GameData::all();
diff --git a/Backend/Controllers/FileHandler/updateFiles.php b/Backend/Controllers/FileHandler/updateFiles.php
index 1ee2f62..69c6c12 100644
--- a/Backend/Controllers/FileHandler/updateFiles.php
+++ b/Backend/Controllers/FileHandler/updateFiles.php
@@ -38,19 +38,30 @@ if (isLogin()) {
 
         $gameData->game_name = $title;
         if (isset($gameData) && $gameFileError === 0) {
-            unlink("../../Games/" . $gameData->game_link);
-            $gameData->game_link = ZipFileHandler($gameFileName, $gameFileTmp);
+            if(unlink("../../Games/" . $gameData->game_link)){
+                $gameData->game_link = ZipFileHandler($gameFileName, $gameFileTmp);
+            }else{
+                http_response_code(500);
+                exit();
+            }
+
         }
         $gameData->description = $desc;
         if (isset($thumbnail) && $thumbnailFileError === 0) {
-            unlink("../../../Frontend/images/" . $gameData->img);
-            $gameData->img = imagesFileHandler($thumbnailFileName, $thumbnailFileTmp);
+
+            if(unlink("../../../Frontend/images/" . $gameData->img)){
+                $gameData->img = imagesFileHandler($thumbnailFileName, $thumbnailFileTmp);
+            }else{
+                http_response_code(500);
+                exit();
+            }
+
         }
         $gameData->is_web_Based = $isWebBased;
         if (!$gameData->save()) {
             http_response_code(500);
         } else {
-            http_response_code(201);
+            http_response_code(200);
         }
 
     } else {
diff --git a/Backend/Controllers/FileHandler/upload.php b/Backend/Controllers/FileHandler/upload.php
index d95e075..5dd7aff 100644
--- a/Backend/Controllers/FileHandler/upload.php
+++ b/Backend/Controllers/FileHandler/upload.php
@@ -23,7 +23,7 @@ if (isLogin()) {
             echo json_encode(["message" => "gameJam not found"]);
             exit();
         }
-        $registration = Registration::where('game_jam_id', $gameJam->id)->where("group_id", $group->id)->frist();
+        $registration = Registration::where('game_jam_id', $gameJam->id)->where("group_id", $group->id)->first();
         if ($registration === null) {
             http_response_code(401);
             echo json_encode(["message" => "group not registered for that game jam"]);
diff --git a/Backend/Controllers/keyWord/GetKeyWinner.php b/Backend/Controllers/keyWord/GetKeyWinner.php
index 15640b2..d412f00 100644
--- a/Backend/Controllers/keyWord/GetKeyWinner.php
+++ b/Backend/Controllers/keyWord/GetKeyWinner.php
@@ -6,12 +6,12 @@ use \Backend\Models\KeyWord;
 use \Backend\Models\GameJam;
 use Backend\Models\Registration;
 
-if (!isAdmin()) {
-    if (isset($_GET['genKeyWord'])) {
+if (isAdmin()) {
+    if (isset($_GET['gameJamId'])) {
         $gameJamId = $_GET['gameJamId'];
         $game_jam = GameJam::find($gameJamId);
         $all_registration_in_game_jam_id = Registration::where("game_jam_id", $game_jam->id)->pluck("id")->toArray();
-        $find_all_keywords = KeyWord::whereIn("group_id", $all_registration_in_game_jam_id)->inRandomOrder()->take(6)->get();
+        $find_all_keywords = KeyWord::whereIn("registration_id", $all_registration_in_game_jam_id)->inRandomOrder()->take(6)->get();
         $game_jam->key_word = $find_all_keywords->first()->key_word;
         if (!$game_jam->save()) {
             http_response_code(500);
diff --git a/Backend/Controllers/keyWord/NewKeyWord.php b/Backend/Controllers/keyWord/NewKeyWord.php
index f58e313..d739e84 100644
--- a/Backend/Controllers/keyWord/NewKeyWord.php
+++ b/Backend/Controllers/keyWord/NewKeyWord.php
@@ -7,20 +7,20 @@ use Backend\Models\Registration;
 use Backend\Models\Group;
 use Backend\Models\KeyWord;
 
-session_start();
-
 if (isLogin()) {
     if (isset($_POST['submitKeyWord'])) {
         //Find the group
         $group = groupViaToken($_SESSION['token']);
 
-        if($gameJam = GameJam::find($_POST["gameJamId"]) === null){
+        if(!$gameJam = GameJam::find($_POST['gameJamId'])){
             http_response_code(400);
             echo json_encode(["message" => "gameJam not found"]);
             exit();
         }
-        $registration = Registration::where('game_jam_id', $gameJam->id)->where("group_id", $group->id)->frist();
-        if ($registration === null) {
+        //var_dump($gameJam);
+
+        $registration = Registration::where('game_jam_id', $gameJam->id)->where("group_id", $group->id)->first();
+        if (!$registration) {
             http_response_code(401);
             echo json_encode(["message" => "group not registered for that game jam"]);
             exit();
@@ -33,7 +33,7 @@ if (isLogin()) {
             $keyword = new KeyWord();
 
             //Take the keyWord the user typed and set it equal to the keyword valuable
-            $keyword->key_word = $_POST['key_word'];
+            $keyword->key_word = $_POST['keyWord'];
 
             //Make foreign key from the groups table to the keyWords table
             $keyword->registration()->associate($registration);
diff --git a/Backend/Database/GameJam.php b/Backend/Database/GameJam.php
index 7baa80d..8ee750e 100644
--- a/Backend/Database/GameJam.php
+++ b/Backend/Database/GameJam.php
@@ -13,7 +13,8 @@ Capsule::schema()->create("game_jams", function (Blueprint $table) {
     $table->dateTime("start_time");
     $table->dateTime("end_time");
     $table->string("key_word")->nullable();
-    $table->text("description")->nullable();
+    $table->text("description");
+    $table->boolean("is_finished")->default(false);
     $table->timestamps();
 });
 
diff --git a/Backend/Database/KeyWord.php b/Backend/Database/KeyWord.php
index e341c76..e271a17 100644
--- a/Backend/Database/KeyWord.php
+++ b/Backend/Database/KeyWord.php
@@ -10,7 +10,7 @@ use Illuminate\Support\Facades\Schema;
 Capsule::schema()->create("key_words", function (Blueprint $table) {
     $table->id();
     $table->string('key_word');
-    $table->foreignId("registrations_id")->constrained("registrations");
+    $table->foreignId("registration_id")->constrained("registrations");
     $table->timestamps();
 });
 
diff --git a/Backend/Models/GameJam.php b/Backend/Models/GameJam.php
index 466fdc2..76ab2db 100644
--- a/Backend/Models/GameJam.php
+++ b/Backend/Models/GameJam.php
@@ -12,7 +12,8 @@ class GameJam extends Eloquent
         'start_time',
         'end_time',
         'key_word',
-        'description'
+        'description',
+        'is_finished'
     ];