updates, works well now
Merge pull request #1 from jmmaloney4/dev1

updates, works well now