Greg Banish has some great books on tuning. Agreed with above - fix the fueling first, then play with timing, then revise the fuel one more time and you'll be good.