LOT Of Fixes!!!

FIXED issues with wiring not matching others