more fixes to the format