Now assigns correct units for all products, including GEO [1495]