Stash changes
Make some minor adjustments
Merge pull request #7 from jeffmess/fix-bugs

Fix bugs