Nn dsc 337

Fixed a number of important defects in DSC-337