numerous changes to work with requests 2
changes
fix