I had some goofiness in my car that I remedied as well. You know when you look under the dash and see wire nuts, you're in trouble.
I basically just took anything that didn't work or was modified and traced the wires out and ran continuity checks to make sure I had the correct wire on each...