two new units and fixes