Update and enhance readme
Update todo