some progress on R2 fixes