Add units and more comments