I have two Atlas GP 7/9 units that have the CN-GP decoders in them. Neither one runs very consistently. I have cleaned the track (other engines run great with drop in decoders) , I cleaned the wheels on the Atlas units, and I'm thinking the problem is between the trucks and contact wipes. Any suggestions to improve the pickup ?