edited todo and future features