So very stuck...

Okay, done as told. Timing is now at 16* and I'm all in at 36* at 3100 rpm.