Development

Fixes #13. Fixes #16. Fixes #5.