Updated TODO, added new planned features