Change distance to meter to use SI base unit consistently.
Add mass SI and non-SI units.