fixed some timing bugs in dao