more misc formatting fixes