user mostly done, dao fixes