Updated settings handling, API Key validation