Adjust wording, add API todo