Unfortunately some things can't be fixed so easily, as fahoumh said. It turns out the controller isn't working as it should. The O button works intermittently, which is a problem since I started playing a game that uses it as the attack button. I'm going to take it apart again, but looks like I'll have to drop $40 for a new controller. After destroying 2 keyboards due to game rage, you'd think I'd learn to stop taking out my frustration on the hardware.