API: correct and improve API.