More new stuff

Fixes #498
Fixes #627