More docs
Merge pull request #1135 from xoppa/various

More docs