updated doc and todo