Several Adds / Fixes

Adds #543.
Adds #731.
Fixes #756.

Commit messages for details.