oh wind, how i hate thee

Bubs is usually very good during the day with his wind - even 'self burps' alot of the time! (5 weeks old) But come night times - esp the 2/3am feed - it is almost impossible to burp him completely! so then we have a baby who is uncomfortable and grunting trying to fart the wind out! and so bubs doesn't sleep very well. Any tricks of the trade to either get the wind out or help him to 'pass' the wind.......which doesn't happen easily too!
wondering if its something i'm eating too?? i'm staying away for alot of fart making foods except onions - has anyone found anything obvious that effects that i wouldn't even think off?

questions, questions, questions!!!

I find if I let my DD lie down for a minute or so on a hard surface so her back is straight (not a bed), it normally settles the bubbles into one, otherwise I put her high on my left shoulder (works WAY better than the right) and do clockwise circles on her back below her ribs on her left side (where her tummy is), firm pressure but not too hard, that works 98% of the time to get the last little *eh* out!

I used to struggle burping DD and then I watched baby whisperer and started that technique which Mrs Emma has posted a link too and it worked wonders. I was so proud of myself! haha