some fixes to formatting