apply units
fix a few minor glitches
more unit fixes
typo