Rounded up loose ends. Fixes #12.