got it to work!
I decided to just reinstall the 4.0 software and it whiped my phone clean and now it works after a fresh install.
Thank you everyone for your help