Return to sio+rq_stats for now, cleanup and tweaks