diff --git a/.gitignore b/.gitignore
index fa31388..aeb82b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@ build/
 .vscode/
 a.out
 val/
-tmp*
\ No newline at end of file
+tmp*
+test/
\ No newline at end of file
diff --git a/README.md b/README.md
index 62a82c2..1a6027f 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Work is still in porgress, buf when you will see a "finished" topic assigned to
 * Command input with `left` and `right` arrow, `home` and `end` keys navigation and `backspace`, `delete` support
 * Running commands in separate process and termination them with `ctrl+c`
 * `cd` and `exit` builtin commands
-* Files and commands from `/bin` autocompletion on `Tab` keypress
+* Files and commands from `/usr/bin` autocompletion on `Tab` keypress
 
 # Builtin commands
 * `cd`: changes current working directory to the one specified by user. If no arguments provided, shows error.
@@ -19,5 +19,4 @@ Work is still in porgress, buf when you will see a "finished" topic assigned to
 * Replace linux `echo` command with builtin one with support of environmental variables
 * Environmental variables
 * `Ctrl+Z` running programm with `fd`
-* Commands autocompletion
 * Getting commands path from system `PATH` environment variable 
\ No newline at end of file
diff --git a/src/complete.c b/src/complete.c
index c203a2e..6e6ebda 100644
--- a/src/complete.c
+++ b/src/complete.c
@@ -19,17 +19,16 @@ bool check_if_executable(char *path, char *file_name)
 
 size_t get_dir_list(char ***dir_list, char *path, int ex)
 {
-    size_t n = 0;
-    *dir_list = malloc(sizeof(char *) * n);
-
     DIR *dir;
     struct dirent *ent;
 
     if ((dir = opendir(path)) == NULL)
     {
-        perror("opendir");
+        perror("\nOpendir");
         return -1;
     }
+
+    size_t n = 0;
     while ((ent = readdir(dir)) != NULL)
     {
         if (ex != 0 && !check_if_executable(path, ent->d_name))
@@ -53,7 +52,7 @@ size_t get_dir_list(char ***dir_list, char *path, int ex)
 
 size_t get_complete_options(char ***opts, char *line, char **to_complete)
 {
-    char **args, **folders = malloc(0);
+    char **args = NULL, **folders = malloc(0);
     size_t sz;
 
     int am = sep_string(line, &args, " ");
@@ -62,26 +61,35 @@ size_t get_complete_options(char ***opts, char *line, char **to_complete)
 
     if (am > 0)
     {
+        int path_depth = sep_string(last_arg, &folders, "/");
+        *to_complete = strdup(folders[path_depth - 1]);
+
+        char *curr_pos = NULL;
+        int i = 0;
+
         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()
+            curr_pos = strdup("");
         }
         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()
+            curr_pos = strdup(".");
+        }
+        else if (last_arg[0] == '.' && last_arg[1] == '/')
+        {
+            curr_pos = strdup(folders[0]);
+            i++;
         }
         else
             goto ABSOLUTE;
+
+        for (int i = 0; i < (path_depth - 1); i++)
+        {
+            curr_pos = realloc(curr_pos, strlen(curr_pos) + strlen(folders[i]) + 2);
+            curr_pos = strcat(curr_pos, "/");
+            curr_pos = strcat(curr_pos, folders[i]);
+        }
+        sz = get_dir_list(opts, curr_pos, 0);
     }
     else
     {
@@ -93,6 +101,9 @@ size_t get_complete_options(char ***opts, char *line, char **to_complete)
     free_str_arr(args);
     free_str_arr(folders);
 
+    if (sz == -1)
+        return sz;
+
     if ((*to_complete)[0] != '\0')
     {
         sz = filter_options(opts, &sz, *to_complete);
@@ -107,7 +118,18 @@ size_t filter_options(char ***comp_list, size_t *size, char *filter_string)
     for (size_t i = 0; i < *size; i++)
         insert_tree(child_dirs_root, (*comp_list)[i]);
 
-    *size = list_strings_containing(child_dirs_root, filter_string, comp_list);
+    char **folders = NULL;
+    int path_depth = sep_string(filter_string, &folders, "/");
+
+    char *last_option = strdup(filter_string);
+
+    if (path_depth > 0)
+    {
+        free(last_option);
+        last_option = folders[path_depth - 1];
+    }
+
+    *size = list_strings_containing(child_dirs_root, last_option, comp_list);
 
     free_tree(child_dirs_root);
 
diff --git a/src/keys.c b/src/keys.c
index d3a3808..96b0f03 100644
--- a/src/keys.c
+++ b/src/keys.c
@@ -18,8 +18,7 @@ void delete_key(int pos, int *n, char **line)
         remove_on_pos(line, pos + 1);
         (*n)--;
 
-        char *buff = malloc(1);
-        buff[0] = '\0';
+        char *buff = strdup("");
         size_t buff_size = 1;
 
         append_to_buff(&buff, &buff_size, "\0337", 2);
@@ -68,8 +67,7 @@ void move_right(int *pos, int n)
  */
 void home_key(int *pos)
 {
-    char *buff = malloc(1);
-    buff[0] = '\0';
+    char *buff = strdup("");
     size_t buff_size = 1;
 
     for (int i = 0; i < *pos; i++)
@@ -89,8 +87,7 @@ void home_key(int *pos)
  */
 void end_key(int *pos, int n)
 {
-    char *buff = malloc(1);
-    buff[0] = '\0';
+    char *buff =strdup("");
     size_t buff_size = 1;
 
     for (int i = 0; i < n - *pos; i++)
@@ -118,8 +115,7 @@ void backspace_key(int *pos, int *n, char **line)
         (*n)--;
         (*pos)--;
 
-        char *buff = malloc(1);
-        buff[0] = '\0';
+        char *buff = strdup("");
         size_t buff_size = 1;
 
         append_to_buff(&buff, &buff_size, "\033[D", 3);
@@ -152,11 +148,10 @@ void tab_key(int *pos, int *n, char **line)
     *pos = strlen(*line);
     *n = *pos;
 
-    char *buff = malloc(1), *output;
-    buff[0] = '\0';
+    char *buff = strdup(""), *output = NULL;
     size_t buff_size = 1;
 
-    char **complete_options, *to_complete;
+    char **complete_options = malloc(0), *to_complete = NULL;
     size_t opts_sz = get_complete_options(&complete_options, *line, &to_complete);
 
     if (opts_sz == 1)
@@ -172,10 +167,14 @@ void tab_key(int *pos, int *n, char **line)
     }
     else
     {
+        append_to_buff(&buff, &buff_size, "\x1b[2K\r", 5);
 
-        append_to_buff(&buff, &buff_size, "\x1b[2K", 4);
+        if ((int)opts_sz < 1)
+        {
+            append_to_buff(&buff, &buff_size, "No suggestions", strlen("No suggestions"));
+        }
 
-        for (int i = 0; i < opts_sz; i++)
+        for (int i = 0; i < (int)opts_sz; i++)
         {
             append_to_buff(&buff, &buff_size, complete_options[i], strlen(complete_options[i]));
             append_to_buff(&buff, &buff_size, " ", 1);
@@ -207,8 +206,7 @@ void tab_key(int *pos, int *n, char **line)
  */
 void printable_key(int *pos, int *n, char c, char **line)
 {
-    char *buff = malloc(1);
-    buff[0] = '\0';
+    char *buff = strdup("");
     size_t buff_size = 1;
 
     (*n)++;
diff --git a/src/shell.c b/src/shell.c
index f955b71..26940af 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -16,13 +16,12 @@ int (*builtin_func[])(char **) = {
  */
 void process_command()
 {
-    char **args;
+    char **args = NULL;
     int status;
 
     do
     {
-        char *line = malloc(1);
-        line[0] = '\0';
+        char *line = strdup("");
 
         char *prompt = compose_prompt();
 
@@ -48,7 +47,7 @@ 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);
+    char *tok = NULL, *rest = strdup(line);
 
     while ((tok = strtok_r(rest, " ", &rest)) != NULL)
     {
@@ -157,8 +156,7 @@ int sh_exit(char **args)
 
 char *compose_prompt()
 {
-    char *prompt = malloc(1);
-    prompt[0] = '\0';
+    char *prompt = strdup("");
 
     prompt = realloc(prompt, strlen(prompt) + 4);
     if (getuid() == 0)
diff --git a/src/utils.c b/src/utils.c
index 9cd3833..2b9e6cd 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -36,11 +36,9 @@ void remove_on_pos(char **str, int pos)
     size_t len = strlen(*str);
     if (pos <= len)
     {
-
         for (int i = pos - 1; i < len; i++)
-        {
             (*str)[i] = (*str)[i + 1];
-        }
+
         (*str)[len] = '\0';
         *str = realloc(*str, len);
     }
@@ -50,11 +48,12 @@ void remove_on_pos(char **str, int pos)
 
 int sep_string(char *line, char ***toks, char *sep)
 {
+    free(*toks);
     char *tmp_line = strdup(line);
     int n = 0;
     *toks = malloc(sizeof(char *) * n);
 
-    char *tmp;
+    char *tmp = NULL;
     while ((tmp = strsep(&tmp_line, sep)) != NULL)
     {
         n++;
@@ -62,18 +61,20 @@ int sep_string(char *line, char ***toks, char *sep)
         (*toks)[n - 1] = strdup(tmp);
     }
 
+    free(tmp_line);
+
     return n;
 }
 
 char *trim_string(char **str)
 {
     while ((*str)[0] == ' ')
-        memmove(*str, *str + 1, strlen(*str));
+        remove_on_pos(str, 1);
 
     for (int i = 1; i < strlen(*str); i++)
         if ((*str)[i] == ' ' && (*str)[i - 1] == ' ')
         {
-            memmove(*str + i, *str + i + 1, strlen(*str + i));
+            remove_on_pos(str, i);
             i--;
         }
 
@@ -82,10 +83,8 @@ char *trim_string(char **str)
 
 void free_str_arr(char **arr)
 {
-    for (int i = 0; i < sizeof(arr) / sizeof(char *); i++)
-    {
-        free(arr[i]);
-    }
-
+    if (arr)
+        for (int i = 0; i < sizeof(arr) / sizeof(char *); i++)
+            free(arr[i]);
     free(arr);
-}
\ No newline at end of file
+}