Tormented by the #20 trigger spring

I've done trigger work on 1911s, revolvers and Glocks (a piece of cake). In fact, I can almost take apart 1911s and Glocks in my sleep.

Having just bought a Steyr I was unimpressed with the rough trigger. Using the tutorial on this site I decided to take it apart to see if I could polish some internals to make it lighter and smoother. BIG MISTAKE!!!!

I followed the directions in the tutorial and disassembled the M9 pretty easily. I lightly polished what I thought might make a difference and tried to put the gun back together. This is where my 2-day nightmare began. I'm totally humbled!!! I can't figure out how the *.%^ #20 spring goes back into the trigger.

The tutorial talks about orienting the spring: "the funky shaped end goes into the trigger with the straight end sticking out." First, the whole spring is funky so I don't know what "the funky end" means. Is that the part with the 90 deg. bent leg? Does the leg of the spring lay on top of the trigger or does it actually go THROUGH (there seems to be a way to cram it under and through the trigger)? A photo of the correct way the spring lays onto or goes through the trigger would help immensely.

The rest of the gun is easy to put back together. Also, I understand that the new M1A Steyr doesn't have the manual lock. Often when I drop the slide on a mag the manual lock drops down. Is there a simple way to deactivate or remove it?