Fixes #16
Tweaks that hopefully closes #17