I'm thinking of rolling back as well. Mainly because I could never get the market fixed with the leaked 2.2. There's a ton of apps I have to side load from my wifes Captivate and it's getting tiresome. Plus my battery life is atrocious with leaked 2.2.