More currencies added, less hardcoding now for currencies