Updated README, TODO and modules