Updated readme and todo