* ++

* ++

* ++

* ++

* ++

* dart docs

* test fix

* undo unintended change

* fix test

* fix test

* review feedback