updated TODO and made minor revisions