fixes to currency number formatting - will pick first from currency master and also made explict options for number formatting