API, little improvements.