major fixes with APIUse functions