Thanks Ronster. It took me about 2 seconds to figure out the Jyn/Yavin 4 interrogation scene was a reshoot. So much better in the trailer. There were a couple bad things in the first trailer but not many and overall it was way better than the final film.
Disney and their University Admissions Poster execs need to stay the **** out of these movies.