fixed doc erros and added more todos