Improve request headers
Add comments