add more options to tab completion
merge in tab completions support