iPhone Firmware 2.1: What now?

Well, here we go again, on the Apple Roller coaster ride, will 2.1 do what it's supposed to?

We will find out, back to battery testing with 3G and edge, and see if they are closer now...I won't hold my breath.