Multiple Tiny Fixes

Fixes issue #15