add %P and %B formats, fixed %I