more flags and repairs