Fix date issue and format currency