Extend and improve tutorial/doc