Add + to default format; add %l option for format