I've had a 1st Gen 16GB Touch for a few months. It's worked like a charm. However, after upgrading to the 2.1 firmware (5F137), it now drains the battery continuously. With the 2.0 firmware, I could click the lock button on the top of the Touch, and, even if I let it sit for a couple of days, there would be minimal battery drain. Now, with the 2.1 firmware, I click the lock button (no music playing, no apps open, nothing else going on) and despite the screen being off, it drains the battery down as though it was playing music the whole time. Has anyone else seen this? I'm tempted to downgrade because of it. Not happy, Apple!!