add units and remove some warnings from the UI