Add units and change separators. Thanks glebourg.