I forgot to mention that in this version, Han negotiates with Greedo and they both agree (over a non-alcoholic beverage) that Jabba is a bad creature. They exchange a few knowing chuckles, pat each other on the back and head their seperate ways.

It's all very touching, in an after school special sort of way.