diff --git a/Wordsalad/game.c b/Wordsalad/game.c
index a5d3f42..fef8b08 100644
--- a/Wordsalad/game.c
+++ b/Wordsalad/game.c
@@ -30,28 +30,29 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
    int ROWS = 0;
    int COLS = 0;
 
-   for (int r=0; r < ROWS; r++) {
-      for (int c =0; c < COLS; c++) {
-         salad[r][c] = '.';
+   for (unsigned int r=0; r < searchFieldLen; r++) {
+      for (int c =0; c <searchFieldLen; c++) {
+         salad[r][c] = EMPTY_CHAR;
       }
    }
-
-   int tries = 0;
+   
    //Wörter plazieren
    for (unsigned int w = 0; w< wordCount; w++) {
       int wordLen = strlen(words[w]);
       int placed = 0;
+      int tries = 0;
       while (!placed && tries < MAX_RAND_TRIES_PER_WORD) {
          int direction = rand() % 2;
          int row;
          int col;
          int fits = 1;
          if (direction == 0) {
-            row = rand() % ROWS;
-            col = rand() % (COLS - wordLen +1);
+            row = rand() % searchFieldLen;
+            col = rand() % (searchFieldLen - wordLen +1);
             for (int i = 0; i< wordLen; i++) {
-               if (salad[row][col +i] != '.') {
+               if (salad[row][col +i] != EMPTY_CHAR) {
                   fits = 0;
+                  break;
                }
             }
             if (fits) {
@@ -62,11 +63,12 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
             }
          }
          else {
-            row = rand() % (ROWS - wordLen +1);
-            col = rand() % COLS;
+            row = rand() % (searchFieldLen - wordLen +1);
+            col = rand() % searchFieldLen;
             for (int i = 0; i< wordLen; i++) {
-               if (salad[row+i][col] != '.') {
+               if (salad[row+i][col] != EMPTY_CHAR) {
                   fits = 0;
+                  break;
                }
             }
             if (fits) {
@@ -80,9 +82,9 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
       }
    }
    //Rest mit Zufallsbustaben füllen
-   for (int r=0; r < ROWS; r++) {
-      for (int c=0; c < COLS; c++) {
-         if (salad[r][c] == '.') {
+   for (unsigned int r=0; r < searchFieldLen; r++) {
+      for (int c=0; c < searchFieldLen; c++) {
+         if (salad[r][c] == EMPTY_CHAR) {
             salad[r][c]='A' + rand() % 26;
          }
       }