various r8 updates