Added supplemental tab completion, fixed pout messages