handle plural units, general cleanup