Update for simplification and add twrp flags and fstab