some dao bugs fixed