some minor clean up and add flags to twrp