Readme and todo updated