add units_only command line option, and test