added some more error handling and decreased requests