rename
updated helptext
moved DAO
another lot of changes