dR fix and other stuff