Added some more to format.string