multiline functionnality + some tweaks in units