fix units and formating