safety and stabilization

Could not connect to the API.