several formatting updates