Fixed some things in DAOs, still few issues
merged. hopefully