- fixed bugs in DAO