Minor refactoring of units.

Changing all units to be consistent in design, methods, and comments.
Merge pull request #1 from mjervis/origin

Minor refactoring of units.