Correcting things from ujwal with svea.
Last changes.