fixed '--' formatting error in comments
added to TODO listw
Added multi-currency support