misc formatting fixes