Added more info formats, and fixed a bug in one
Fixed the clumsy handling of %% in format strings.
Much nicer do_format

Closes #286