From the Wall Street Journal, this graphic is an excellent rundown of the differences between the House and Senate immigration bills:
Now it goes to conference, where the Senate's pro-citizenship negotiators will hash it out with the House's xenophobes, fail, and the can will get kicked down the road to 2007.