Revised review fixes, iteration X+1