lots of updates for number styles, comments