promote some functions to API + div. fixes