serveral changes

dao improvement