backport doc changes from pull requests #98 (Stateful)  and #100 (conributor typo)