What RIM needs to do to make the 'Storm 2' Kick Ass

The first Storm failed. I can post 100+ links backing my opinion up. Don't believe me? Check this (Straight from VerizonWireless.com):

Now I must say I was really pumped about the Storm, just as every BlackBerry Fan Boy was.  A week later after I purchased it I exchanged it for a Curve.  If you want can read my review to see why I made that decision.

Here is what RIM needs to do to make a come back (no particular order):

1. Wi-Fi B/G/N
2. Bluetooth 3.0 
3. Webkit Browser + Gears for Offline Support (So important, big reason I returned my Storm)
   
4. Trackpad 
5. Mobile Fingerprint Sensor for Authentication 
6. Built in 16GB Flash Memory
7. Mini & Micro USB ports for charging (Even though the EUC is pushing micro for the standard. A lot of U.S. phones are pushing Mini USB)

I will update this post if I think of anymore. I am not giving up on you yet RIM, but you need to catch-up quick before you loose your precious market share.