updated text  and removed some to-do