production - set better names and show unit, ref #110