I’m so glad I read your comment before I started my own repair, since both of these things would have happened to me. Add to these couple things the alignment of the joystick components being a little fickle. (And boy - those bottom ribbon cables are really small.)