API Key fixed and better logging