More bug fixes that didn't make it because of the git add issue
Merge pull request #19 from ckennedy-nmdp/fix-bugs

More bug fixes that didn't make it because of the git add issue