Update readme and TODOs