reformat and add some ex