Updates to code, fixed bug in dao, set up non-persistent delivery queue