Various updates to RM, UIE, EFF