DAOMaker improvements and small fixes