wip api and fixes