fixed smoke test
minnor bug fixes
Merge pull request #122 from K-McK/master

sync up during 12/5 session