Minor reworkings

Fixes issue #5