Fixing settings bug, improve API calls