There are actually a lot of differences between the finished movie, the various previews we've seen (including trailers), and especially the novelization.
I'm gonna work on compiling a ginormous list of differences this week (well, I'll start on it at least).