minor fixes
Merge pull request #9 from jghezzi/jasons_branch

minor fixes