dsc-154, dsc-785, dsc-824

bug fixes