Adding better usage statements and new usns