Fixes and new api calls