more misc formatting updates