Various expansions and language adjustments