tab completion and spacing bug fix