A whole bunch of cosmetic changes to requests, fixed an edge case bug