Great job.
The DHS will be visiting you at home shortly for starting this prior to your next flight. 
This REALLY is one off those topics that we're all getting the rubber glove treatment next time we fly for. 
My only "awkward" moment came from having the laptop case on a factory floor beside a waveflow solder machine. Oops.
Evidently some of the trace chemicals they use aren't treated as "friendly" by the little swab test.
Bad part was this was PRIOR to 9/11. (9/7/01 in fact) They swab it, little red light flashes and it buzzes. Girl doing it looked at me, kind of puzzled and scared. I laughed, and said, "That's probably not going to bode well for me catching the earlier flight is it?"
2 hours later, and now using a plastic bag from a news stand I was sprinting through the Milwaukee airport to make my original flight. They had to cut out ALL of the padding in my laptop case to check it, plus dismantled my laptop. It sucked. But they were friendly. And laughing.
I doubt it would have been as friendly the week after.
