Minor tweaks
Beginnings of #3
Fixes #7