updated units, and other