additions to api and fixes for changed api endpoints
Merge commit 'eea9f80'