Swapped request URLs and polished options and etc