reformat to fixed lines; minor updates