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

small things, bits of smoke test
merging
Merge pull request #47 from pstephen43/master

sync up