various formatting updates