Readme and TODO update