Cleanups + implementations for some API calls