Currency, optimisation etc etc updates