Better completion and moved to bash_functions file