diff --git a/include/complete.h b/include/complete.h
index 6752197..740f4bc 100644
--- a/include/complete.h
+++ b/include/complete.h
@@ -9,8 +9,12 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <dirent.h>
+#include <stdbool.h>
 
-size_t get_dir_list(char ***dir_list, char *path);
-void complete_line(int *pos, int *n, char **line, char **out);
+bool check_if_executable(char *path, char *file_name);
+size_t get_dir_list(char ***dir_list, char *path, int ex);
+size_t get_complete_options(char ***opts, char *line, char **to_complete);
+size_t complete_line(int *pos, int *n, char **line, char **out);
+size_t filter_options(char ***comp_list, size_t *size, char *filter_string);
 
 #endif
\ No newline at end of file
diff --git a/include/shell.h b/include/shell.h
index 40dae68..5a441a0 100644
--- a/include/shell.h
+++ b/include/shell.h
@@ -13,7 +13,7 @@
 #define ARG_SIZE 32
 
 char *read_line();
-void process_line(char *line, char ***args);
+int process_line(char *line, char ***args);
 int launch(char **args);
 void process_command();
 int execute(char **args);
diff --git a/include/utils.h b/include/utils.h
index 9f83060..df12923 100644
--- a/include/utils.h
+++ b/include/utils.h
@@ -7,7 +7,19 @@
 #include <unistd.h>
 #include <string.h>
 
+extern FILE *log_file;
+
+#define log(fmt, ...)                                 \
+    {                                                 \
+        log_file = fopen("/var/log/mshell.log", "a"); \
+        fprintf(log_file, fmt, __VA_ARGS__);          \
+        fclose(log_file);                             \
+    }
+
 void append_to_pos(char **str, int pos, char ch);
 void remove_on_pos(char **str, int pos);
+int sep_string(char *line, char ***toks, char *sep);
+char *trim_string(char **str);
+void free_str_arr(char **arr);
 
 #endif
\ No newline at end of file
diff --git a/src/complete.c b/src/complete.c
index a5267e5..c203a2e 100644
--- a/src/complete.c
+++ b/src/complete.c
@@ -1,8 +1,23 @@
 #include "../include/complete.h"
 #include "../include/shell.h"
 #include "../include/tree.h"
+#include "../include/utils.h"
 
-size_t get_dir_list(char ***dir_list, char *path)
+bool check_if_executable(char *path, char *file_name)
+{
+    char *file_path = malloc(strlen(path) + strlen(file_name) + 2);
+    file_path[0] = '\0';
+    file_path = strcat(file_path, path);
+    file_path = strcat(file_path, "/");
+    file_path = strcat(file_path, file_name);
+
+    bool ret = access(file_path, X_OK) == 0;
+    free(file_path);
+
+    return ret;
+}
+
+size_t get_dir_list(char ***dir_list, char *path, int ex)
 {
     size_t n = 0;
     *dir_list = malloc(sizeof(char *) * n);
@@ -17,9 +32,18 @@ size_t get_dir_list(char ***dir_list, char *path)
     }
     while ((ent = readdir(dir)) != NULL)
     {
+        if (ex != 0 && !check_if_executable(path, ent->d_name))
+            continue;
+
         n++;
         *dir_list = realloc(*dir_list, sizeof(char *) * n);
         (*dir_list)[n - 1] = strdup(ent->d_name);
+
+        if (ent->d_type == DT_DIR)
+        {
+            (*dir_list)[n - 1] = realloc((*dir_list)[n - 1], strlen((*dir_list)[n - 1]) + 2);
+            (*dir_list)[n - 1] = strcat((*dir_list)[n - 1], "/");
+        }
     }
 
     closedir(dir);
@@ -27,74 +51,65 @@ size_t get_dir_list(char ***dir_list, char *path)
     return n;
 }
 
-void complete_line(int *pos, int *n, char **line, char **out)
+size_t get_complete_options(char ***opts, char *line, char **to_complete)
 {
-    (*line)[*pos] = '\0';
-    *out = strdup("\x1b[2K");
-
-    char **comp_list;
-
-    char *curr_path, *tmp_line = strdup(*line);
+    char **args, **folders = malloc(0);
     size_t sz;
 
-    if ((curr_path = strtok(tmp_line, " ")) != NULL && (curr_path = strtok(NULL, " ")) != NULL)
+    int am = sep_string(line, &args, " ");
+
+    char *last_arg = args[am - 1];
+
+    if (am > 0)
     {
-        sz = get_dir_list(&comp_list, get_current_dir_name());
+        if (last_arg[0] == '/')
+        {
+            int path_depth = sep_string(last_arg, &folders, "/");
+            *to_complete = strdup(folders[path_depth - 1]);
+            sz = get_dir_list(opts, last_arg, 0); // pass / + all $folders instead of last_arg
+        }
+        else if (last_arg[0] == '.' && last_arg[1] == '/')
+        {
+            int path_depth = sep_string(last_arg + 1, &folders, "/");
+            *to_complete = strdup(folders[path_depth - 1]);
+            sz = get_dir_list(opts, get_current_dir_name(), 0); // pass get_current_dir_name() + all $folders instead of get_current_dir_name()
+        }
+        else if (strchr(line, ' '))
+        {
+            int path_depth = sep_string(last_arg, &folders, "/");
+            *to_complete = strdup(folders[path_depth - 1]);
+            sz = get_dir_list(opts, get_current_dir_name(), 0); // pass get_current_dir_name() + all $folders instead of get_current_dir_name()
+        }
+        else
+            goto ABSOLUTE;
     }
     else
     {
-        sz = get_dir_list(&comp_list, "/usr/bin");
-        curr_path = *line;
+    ABSOLUTE:
+        *to_complete = strdup(line);
+        sz = get_dir_list(opts, "/usr/bin", 1);
     }
-    if (*pos > 0 && (*line)[*pos - 1] != ' ')
+
+    free_str_arr(args);
+    free_str_arr(folders);
+
+    if ((*to_complete)[0] != '\0')
     {
-        curr_path = strdup(curr_path);
-
-        char *tmp;
-        while ((tmp = strtok(NULL, " ")) != NULL)
-        {
-            free(curr_path);
-
-            curr_path = strdup(tmp);
-        }
-
-        struct tree_node *child_dirs_root = get_new_node();
-        for (size_t i = 0; i < sz; i++)
-        {
-            insert_tree(child_dirs_root, comp_list[i]);
-        }
-
-        sz = list_strings_containing(child_dirs_root, curr_path, &comp_list);
+        sz = filter_options(opts, &sz, *to_complete);
     }
 
-    if (sz == 1)
-    {
-        *out = strdup(comp_list[0] + strlen(curr_path));
-        *pos += strlen(*out);
-        *n = *pos;
+    return sz;
+}
 
-        *line = realloc(*line, strlen(*line) + strlen(*out));
-        *line = strcat(*line, *out);
+size_t filter_options(char ***comp_list, size_t *size, char *filter_string)
+{
+    struct tree_node *child_dirs_root = get_new_node();
+    for (size_t i = 0; i < *size; i++)
+        insert_tree(child_dirs_root, (*comp_list)[i]);
 
-        return;
-    }
+    *size = list_strings_containing(child_dirs_root, filter_string, comp_list);
 
-    for (int i = 0; i < sz; i++)
-    {
-        *out = realloc(*out, strlen(*out) + strlen(comp_list[i]) + 2);
-        *out = strcat(*out, comp_list[i]);
-        *out = strcat(*out, " ");
-    }
+    free_tree(child_dirs_root);
 
-    *out = realloc(*out, strlen(*out) + 2);
-    *out = strcat(*out, "\n");
-
-    char *prompt = compose_prompt();
-    *out = realloc(*out, strlen(*out) + strlen(prompt) + 1);
-    *out = strcat(*out, prompt);
-
-    *out = realloc(*out, strlen(*out) + *pos);
-    *out = strncat(*out, *line, *pos + 1);
-
-    *n = *pos;
+    return *size;
 }
\ No newline at end of file
diff --git a/src/keys.c b/src/keys.c
index 06853ef..d3a3808 100644
--- a/src/keys.c
+++ b/src/keys.c
@@ -2,6 +2,7 @@
 #include "../include/output.h"
 #include "../include/utils.h"
 #include "../include/complete.h"
+#include "../include/shell.h"
 
 /**
  * @brief Delete key action
@@ -27,6 +28,7 @@ void delete_key(int pos, int *n, char **line)
         append_to_buff(&buff, &buff_size, "\0338", 2);
 
         print_str(buff, buff_size);
+        free(buff);
     }
 }
 
@@ -75,6 +77,8 @@ void home_key(int *pos)
 
     print_str(buff, buff_size);
     *pos = 0;
+
+    free(buff);
 }
 
 /**
@@ -95,6 +99,8 @@ void end_key(int *pos, int n)
     print_str(buff, buff_size);
 
     *pos = n;
+
+    free(buff);
 }
 
 /**
@@ -123,6 +129,8 @@ void backspace_key(int *pos, int *n, char **line)
         append_to_buff(&buff, &buff_size, "\0338", 2);
 
         print_str(buff, buff_size);
+
+        free(buff);
     }
 }
 
@@ -137,16 +145,56 @@ void new_line()
 
 void tab_key(int *pos, int *n, char **line)
 {
-    char *buff = malloc(1);
+    (*line)[*pos] = '\0';
+    *line = realloc(*line, strlen(*line) + 1);
+
+    *line = trim_string(line);
+    *pos = strlen(*line);
+    *n = *pos;
+
+    char *buff = malloc(1), *output;
     buff[0] = '\0';
     size_t buff_size = 1;
 
-    char *options;
+    char **complete_options, *to_complete;
+    size_t opts_sz = get_complete_options(&complete_options, *line, &to_complete);
 
-    complete_line(pos, n, line, &options);
-    append_to_buff(&buff, &buff_size, options, strlen(options));
+    if (opts_sz == 1)
+    {
+        char *ending = complete_options[0] + strlen(to_complete);
+        *pos += strlen(ending);
+        *n = *pos;
+
+        *line = realloc(*line, strlen(*line) + strlen(ending) + 1);
+        *line = strcat(*line, ending);
+
+        append_to_buff(&buff, &buff_size, ending, strlen(ending));
+    }
+    else
+    {
+
+        append_to_buff(&buff, &buff_size, "\x1b[2K", 4);
+
+        for (int i = 0; i < opts_sz; i++)
+        {
+            append_to_buff(&buff, &buff_size, complete_options[i], strlen(complete_options[i]));
+            append_to_buff(&buff, &buff_size, " ", 1);
+        }
+
+        append_to_buff(&buff, &buff_size, "\n", 1);
+
+        char *prompt = compose_prompt();
+        append_to_buff(&buff, &buff_size, prompt, strlen(prompt));
+        free(prompt);
+
+        append_to_buff(&buff, &buff_size, *line, *pos);
+    }
 
     print_str(buff, buff_size);
+
+    free(buff);
+    free(to_complete);
+    free_str_arr(complete_options);
 }
 
 /**
@@ -174,4 +222,6 @@ void printable_key(int *pos, int *n, char c, char **line)
     append_to_buff(&buff, &buff_size, "\0338", 2);
 
     print_str(buff, buff_size);
+
+    free(buff);
 }
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index 1831725..6c4f003 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,9 +1,13 @@
 #include <signal.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 
 #include "../include/input.h"
 #include "../include/utils.h"
 #include "../include/shell.h"
 
+FILE *log_file;
+
 void exit_shell()
 {
     change_mode(0);
@@ -11,6 +15,16 @@ void exit_shell()
 
 int main(int argc, char **argv)
 {
+    log_file = fopen("/var/log/mshell.log", "w");
+    if (log_file == NULL)
+    {
+        fprintf(stderr, "Couldn't open log file\n");
+    }
+    else {
+        fprintf(log_file, "\n New session:\n");
+        fclose(log_file);
+    }
+
     change_mode(1);
     signal(SIGINT, SIG_IGN);
 
diff --git a/src/shell.c b/src/shell.c
index 910cc76..f955b71 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -44,13 +44,13 @@ void process_command()
  * @param line 
  * @param args 
  */
-void process_line(char *line, char ***args)
+int process_line(char *line, char ***args)
 {
     int buff_size = ARG_SIZE, pos = 0;
     *args = malloc(buff_size * sizeof(char *));
     char *tok, *rest = strdup(line);
 
-    while ((tok = strtok_r(rest, " \t", &rest)) != NULL)
+    while ((tok = strtok_r(rest, " ", &rest)) != NULL)
     {
         (*args)[pos] = tok;
         pos++;
@@ -68,6 +68,7 @@ void process_line(char *line, char ***args)
     }
 
     (*args)[pos] = NULL;
+    return pos;
 }
 
 /**
@@ -159,7 +160,7 @@ char *compose_prompt()
     char *prompt = malloc(1);
     prompt[0] = '\0';
 
-    prompt = realloc(prompt, strlen(prompt) + 3);
+    prompt = realloc(prompt, strlen(prompt) + 4);
     if (getuid() == 0)
     {
         prompt = strcat(prompt, "\n# ");
diff --git a/src/tree.c b/src/tree.c
index df0aaa5..15ca43c 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -106,10 +106,11 @@ size_t list_strings_containing(struct tree_node *root, char *key, char ***string
     if (is_last == 0)
     {
         char *prefix = strdup(key);
-        prefix = realloc(prefix, strlen(prefix) + 2);
 
         get_all_substrings(current, &amount, &prefix, strings);
 
+        free(prefix);
+
         return amount;
     }
 
@@ -132,6 +133,7 @@ void get_all_substrings(struct tree_node *root, size_t *amount, char **curr_pref
     {
         if (root->child[index] != NULL)
         {
+            *curr_prefix = realloc(*curr_prefix, strlen(*curr_prefix) + 2);
             *curr_prefix = strncat(*curr_prefix, (char *)(&index), 1);
 
             get_all_substrings(root->child[index], amount, curr_prefix, strings);
diff --git a/src/utils.c b/src/utils.c
index 5d89c0c..9cd3833 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -37,7 +37,7 @@ void remove_on_pos(char **str, int pos)
     if (pos <= len)
     {
 
-        for (int i = pos - 1; i <= len; i++)
+        for (int i = pos - 1; i < len; i++)
         {
             (*str)[i] = (*str)[i + 1];
         }
@@ -46,4 +46,46 @@ void remove_on_pos(char **str, int pos)
     }
     else
         fprintf(stderr, "Can't remove symbol outside the string\n");
+}
+
+int sep_string(char *line, char ***toks, char *sep)
+{
+    char *tmp_line = strdup(line);
+    int n = 0;
+    *toks = malloc(sizeof(char *) * n);
+
+    char *tmp;
+    while ((tmp = strsep(&tmp_line, sep)) != NULL)
+    {
+        n++;
+        *toks = realloc(*toks, sizeof(char *) * n);
+        (*toks)[n - 1] = strdup(tmp);
+    }
+
+    return n;
+}
+
+char *trim_string(char **str)
+{
+    while ((*str)[0] == ' ')
+        memmove(*str, *str + 1, strlen(*str));
+
+    for (int i = 1; i < strlen(*str); i++)
+        if ((*str)[i] == ' ' && (*str)[i - 1] == ' ')
+        {
+            memmove(*str + i, *str + i + 1, strlen(*str + i));
+            i--;
+        }
+
+    return *str;
+}
+
+void free_str_arr(char **arr)
+{
+    for (int i = 0; i < sizeof(arr) / sizeof(char *); i++)
+    {
+        free(arr[i]);
+    }
+
+    free(arr);
 }
\ No newline at end of file