Cleaned up the units

Cleaned up the units, generally following Gesturs idea