added currency format, other formatting