added units to some calculations