rounding and formatting money!
fix merge