master: Adding DirNodeDao basic, some changes here and there, typos etc