improve tasks / add TODO