serveral format changes