revise "pretty" option

-p is now a separate option which
can be invoked in conjunction with
any set