reformat to kill CR; add user option to fix template