Lots of updates to ROW scheduler and associated