Add spacing between value and unit.
Add unit and allowed units.
Fix merge conflict.