Fixed formatting of messages, added currency support