I tried the revolutionary method described in his post to unroot and get s-on, it says LOCKED and security warning in pink now, as well as s-on under that, but it's still rooted as I can take screen shots still, and when I try to download the OTA it'll fail, or after it downloads it just restarts back into that white screen with the pink highlited text on it and either hboot or fastboot highlited.
I followed the guide exactly as it said, I have no idea why it won't work.. gahh. I have endless reboots now, which I fixed by clicking "clear cache", but that option isn't on there anymore... clicking recovery just takes it to fast boot