fixed some things
Merge pull request #1 from jrotolo/jarrod-dev

fixed some things