diff --git a/src/complete.c b/src/complete.c
index 76b08db..1eab645 100644
--- a/src/complete.c
+++ b/src/complete.c
@@ -50,6 +50,9 @@ ssize_t get_dir_list(char ***dir_list, char *path, int ex)
         if (ex != 0 && !check_if_executable(path, ent->d_name))
             continue;
 
+        if (ent->d_name[0] == '.')
+            continue;
+
         n++;
         *dir_list = realloc(*dir_list, sizeof(char *) * n);
         (*dir_list)[n - 1] = strdup(ent->d_name);
@@ -114,7 +117,7 @@ ssize_t get_complete_options(char ***opts, char *line, char **to_complete)
         {
             curr_pos = strdup("");
         }
-        else if (strchr(line, ' '))
+        else if (strchr(line, ' ') && strcmp(args[am - 2], "||") != 0 && strcmp(args[am - 2], "&&") != 0 && strcmp(args[am - 2], ";") != 0 && line[strlen(line) - 2] != ';' && line[strlen(line) - 2] != '&' && line[strlen(line) - 2] != '|')
         {
             curr_pos = strdup(".");
         }
@@ -138,8 +141,12 @@ ssize_t get_complete_options(char ***opts, char *line, char **to_complete)
     }
     else
     {
-    ABSOLUTE:
         *to_complete = strdup(line);
+    ABSOLUTE:
+        if ((*to_complete)[0] != '\0' && am >= 2)
+            if (strcmp(args[am - 2], "||") == 0 || strcmp(args[am - 2], "&&") == 0 || strcmp(args[am - 2], ";") == 0)
+                *to_complete = strdup("");
+
         sz = get_dir_list(opts, "/usr/bin", 1);
 
         append_builtin_list(opts, &sz);
diff --git a/src/shell.c b/src/shell.c
index 7e57d4a..fa49aa9 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -85,7 +85,8 @@ int process_line(char *line, cmds_p **coms)
         if (line[i] == '"')
         {
             tmp++;
-            int j = i + 1;
+            i++;
+            int j = i;
             for (; j < line_size; j++)
                 if (line[j] == '"')
                 {
@@ -111,7 +112,14 @@ int process_line(char *line, cmds_p **coms)
                 i--;
                 continue;
             }
-            i += j - i;
+
+            i = j;
+            
+            if (tmp[0] == ' ')
+            {
+                tmp++;
+                i++;
+            }
         }
         else if (line[i] == ';' || (line[i] == '&' && line[i + 1] == '&') || (line[i] == '|' && line[i + 1] == '|'))
         {