clean things up and try to make requests a bit more reliable