api-update

Bugfixes, functionality additions.