tweaked last few dao changes after testing