fix some bugs
Merge branch 'master' of https://github.com/phenoMEN2708/DA_New_Design.git