Updated API keys & lots of tweaks