Add units

per #173 

- [X] broke out units in a dedicated `units` key
- [X] tightened up some copy


cc @tmcw @edenh