Not showing revs after swap, 3sge 2.0 GT 94 swapped out with a BEAMS Options

[NICOGP]

Hey everyone.
I have changed engine on my lovely Celica to Red top beams engine.
And I have had a lot of issues with wiring the damm thing, but the engine runs now.
I was interested in knowing how I get the revs to show in the dash, any special wiring?
I have also had some problems with the engine running well, and have come to a conclusion that the MAF is not working, because when the plug is on it runs really bad and goes out if not giving it rapidly revs. When the plug is off it runs more smooth and it doesn't goes out, but it's still not running perfectly and the engine failure light is on. I wanted to make sure that I have connected it correctly.

Can any of you confirm this wiring? 

AIRFLOW SENSOR WIRING (MAF)
ECU CODE : D16 (RED/BLACK) TO POSITION 1 ON THE PLUG (+B)
ECU CODE : B1(YELLOW/RED) TO POSITION 2 ON THE PLUG (EVG SENSOR)
ECU CODE : B11 (BLUE/BLACK) TO POSITION 3 ON THE PLUG (VG METER)
ECU CODE : B22 (YELLOW/BLACK) TO POSITION 4 ON THE PLUG (THA TEMP)
ECU CODE : B18 (BRAUN) TO POSITION 5 ON THE PLUG (EARTH)

ST-202 BLMZF (BEAMS)