Fix dx/dx so it can do 'on 1000/4000' and also merge sh/dxcc into sh/dx