xhr2 stuff fixed