minor fixes
Merge branch 'master' of https://github.com/jgoldsmith613/newProject
a few bug fixes