Various changes
Simplified multi currency