Fixing Dao bugs + Design