fixed a few bugs
Merge pull request #1 from taylormartin/suprise-and-delight

fixed a few bugs