TODO updates
Better bash-completion