RR 2.2.2-BETA+ changes

woo moar stoof