misc reformat, and some small details