more R Unit changes & fixes