more Format() fixes

here it is