same battery as the stock size yes, just moved up almost doulbe the mah. and the spring is fine. i havent messed with it. ill buy a new one anyway prob. im tired of crap.

thanks