major dto bug fixes