Zy Fixes II

Fixes #39
Fixes #42
Is #46 fixed? Maybe.