Adding UserAgent & fixing endpoints