Add units and make lang lookup better