small format changes and fixes