Small emma and JS changes