2 quick questions re: 440 reassembly

That is not correct. I believe the short one goes where your long is now, and the long one goes in the lower hole near the sender. The remaining hole is capped off. I may not correct, so someone with pictures can confirm.