wip api and fixes
api fix - silly me
api
Merge branch 'release/jun30'