Changes to app and fixes to API