Pxfmt 140513

Additional format-type combinations + address feedback from Rich.