added the tool tips, made the Dao a little more specific