changed  to  and tweaked tabcomplete