better handling of measurement unit abbreviations