Clarify units and only use oz 2 1 s

same as #157 and #155