CHANGED: Correctly Handle and format amounts and currencies