updated concerns/questions & todo