added units; numeric check and normalization