More unit fixing

Fixed units, copy editing