minor fixes
Merge pull request #17 from tiger-swallowtails-2014/mike

minor fixes