refactored functions,bug squashing
Merge pull request #2 from dmoore5050/dustin_develop

refactored functions,bug squashing