fixed units and minor issues