Thanks for the tips jrichker! I did most of the tune-up stuff like plugs, wires, cap, rotor, all filters, oil change and my engine was warmed up (10 minutes of stop and go driving) when I went for the test.
Should I clean my EGR? Never done it before but it doesn't look like to much trouble...