more number formatting and tiny tweaks