more todos comment added, some removed which has been completed