Remove Bug in DiffusionModel, change other things