I've made these changes, also changed the units to a string matching instead of exact matching, so we're better suited for new units later on.