master: adding some more dao, some cleanup