Removing Wiring Corrosion Help

I think i'll try the baking soda and water thing this week, and see how it works. I've also got a short somewhere, the side marker lights come on with the key, and the blinkers don't work, hopefully should be an easy fix. I do have the correct non adhesive tape, man do i love that stuff!