Shove and Slay Fixes
Merge pull request #571 from Fuzzysqurl/patch-9

Shove and Slay Fixes