Here's a couple of suggestions for rewiring. Grab a sharpie and label the connector or at least as many as possible. another thing i did was grab some zip ties that u can get at harbor freight and there multicolor and use them to label stuff like your smog lines and electrical stuff. There only like $5.00 bucks for 1000 of em. i got like 2000 of em. lying around