Yup, stock battery and everything. I reset it again numerous times last night and it hasn't frozen and I have my edge notifications back. There are a few little glitches but it's better. I'm scared to have to restart the phone because when I did that last time, the edge notifications stopped...