some more format changes