small things, bits of smoke test
Merge pull request #213 from K-McK/master

small things, bits of smoke test