YZirkind

Results 2 issues of YZirkind

As per the changes in 618565b203b61c34b868a9cb86eea899e75ea4b6, the docs should have been updated as well. Fixes #729

Fixes #486 & #601.