Added shared api key, plus some minor changes