Fixing units.
Ignoring temp files (~)
Fixed all units. Tests pass.