merged/updated todo and readme