more request refining, lots more commits shortly