Update To R6, Fixes, Adjustments